From ee3c08ac66d347431895d0a532c0dbeff4f614c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 12 May 2021 12:57:20 +0200 Subject: [PATCH] matchbox-flatcar: disable all LVM mappings Since the disks may or not be not empty, any detected LVM partitions may automatically be activated on bootup. This can disrupt the installation and we need to disable them first. This was done for all "vg" prefixes but we can do it for any volume names. Any non-LVM entries are ignored with a small error log output. See https://github.com/kinvolk/Flatcar/issues/332 --- .../matchbox-flatcar/templates/install.yaml.tmpl | 3 +++ pkg/assets/generated_assets.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl b/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl index c395fd304..3ee71054a 100644 --- a/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl +++ b/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl @@ -30,6 +30,9 @@ storage: contents: inline: | #!/bin/bash -ex + # unmount any leftovers at the beginning before we modify the disk the mount uses + umount /tmp/oemfs || true + lvchange -an /dev/mapper/* || true curl --retry 10 "${ignition_endpoint}?{{.request.raw_query}}&os=installed" -o ignition.json flatcar-install \ %{~ if install_to_smallest_disk ~} diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go index e09513e90..6b1c5d945 100644 --- a/pkg/assets/generated_assets.go +++ b/pkg/assets/generated_assets.go @@ -6594,9 +6594,9 @@ var vfsgenAssets = func() http.FileSystem { "/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "install.yaml.tmpl", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 1407, + uncompressedSize: 1580, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x54\xc1\x8e\xdb\x46\x0c\xbd\xef\x57\xb0\x1b\xb7\xa7\x4a\x76\x0c\xf4\x22\xc0\x28\x92\xa2\x40\x0b\xf4\x54\xa7\xed\x21\x0d\x84\xb1\x86\xb2\xa7\x3b\xe2\x68\x49\xce\xee\xaa\xaa\xf3\xed\xc5\xc8\x96\x6c\xaf\x1d\xe4\x36\x22\x1f\xdf\x3c\x92\x4f\x93\x65\xd9\x9d\x74\xa2\xd8\xd8\xe2\x0e\x20\x92\x53\x49\x07\x80\x0c\xc8\x34\x58\x80\x23\x51\xe3\x3d\x72\x2e\xc8\x4f\xae\xc2\x21\x0b\x80\x64\x36\x1e\x0b\x50\x8e\x63\xa8\x0a\xa4\x48\x2a\x05\xfc\x77\x8c\x00\x7c\xfc\x83\x9c\x7e\x9a\x3e\x7f\xc7\xc7\xe8\x18\x65\x45\xa8\xcf\x81\x1f\xb2\x40\xde\x11\xe6\x6a\x78\x8b\x3a\xc1\xde\xd5\x8a\xfc\x15\xcc\xc7\xf5\x41\xcf\x89\xfc\x43\xd7\xe2\x4a\x5c\xd3\x7a\x9c\x62\x3f\xbf\x60\xb5\x56\xc3\xba\x9a\x87\x56\xe7\x53\x37\x27\x9a\x5f\x0f\xa1\x13\xcd\x5f\x86\x14\xed\xfb\x6e\xd5\x44\xaf\x2e\x8b\x82\x7c\x7e\xf7\x1b\x78\xf7\x14\x9c\x85\x28\x8e\xb6\xa0\x3b\x04\x51\x43\xd6\xb0\x85\xf5\xfa\x17\x68\x03\x2b\x48\x80\x0f\xc8\x6c\xea\xc0\x0d\x98\xb6\xf5\x1d\x54\x86\x28\xe8\x00\x89\xa4\xce\x1f\xb9\xda\x20\x9a\x1d\x55\xe5\xf0\x3e\x2a\x18\xdb\x38\x12\x68\x4c\x37\x80\x35\x80\xc5\x4d\xdc\x82\x75\xf2\x30\x6e\x03\x5a\x0e\x1b\x8f\x8d\xe4\xa3\xa4\x34\xb0\x31\xfb\x3d\x88\xec\x2c\x3c\x3b\xef\x21\x0a\x1e\x24\x2d\x97\x60\x28\xa9\x46\x96\xf9\x49\x5c\x65\x28\xed\x8d\xb0\xd2\xfc\x62\xef\x89\x22\x97\x50\x3d\x4c\x23\xb7\x1c\x5a\x47\x47\x7b\x9c\x43\xdf\x2e\xb2\x84\xce\xd2\x3d\x79\x15\xa8\x9e\x10\xb7\x3d\x71\xd8\xde\x40\xfd\xe9\x22\xf8\x9b\x13\x45\x5a\x2b\xa3\x69\x56\x5f\xce\x2c\x97\xcb\xe5\x9d\x68\x60\xb3\xc5\xa4\xa6\x76\x1e\x27\xd7\xb6\x46\x77\x05\xdc\x5c\xf6\x80\x1b\xcc\x5e\x00\x87\x30\xf6\xd5\x04\x8b\x05\x2c\x7e\x58\x2c\x5e\xfb\x78\x92\xe0\x06\x07\x5e\xf6\xf0\xe6\x9b\xf9\xc6\xd1\x7c\x63\x64\x07\x19\xbe\x9c\xf7\x1c\xd9\x43\x96\x31\x2a\x77\xf0\x76\x01\xf7\xb3\xde\x6d\xc9\xa9\x0b\x54\x22\xd9\x36\x38\xd2\xfd\x8f\x7d\x9f\x33\x3e\x46\x14\xcd\xd9\x3c\x97\x8f\x11\xb9\xdb\xef\xbf\x0b\xb2\x1a\x75\xdb\x7b\xc8\x02\x8c\xa5\xf9\x3f\x12\xe8\xec\x96\xda\x1b\xad\x0c\x8f\xe6\x81\xbf\x2f\x06\xf6\x6d\xff\x19\x5c\x3d\x3a\xa2\xd4\x50\x4a\x93\x38\x45\xcb\xc1\x48\x9f\xf7\x17\xf0\x4c\x6e\xd4\xa3\x17\xbc\x02\x5a\x98\xf5\x23\x6b\x62\xda\xdf\x2a\x24\xeb\xea\xab\xca\x9f\x60\xd6\x07\x29\xab\x9d\x21\x42\xff\xba\x2e\xfb\xf3\x90\x7e\x42\x16\x17\xe8\x2a\x1d\xd2\x18\xd3\x66\x8c\x23\xe4\xd2\x3b\x8a\x2f\x65\xc0\x66\x7f\xff\x0a\x39\xeb\x37\x46\x30\xb2\x2f\x6b\x6f\xb6\x57\x3c\xee\x8b\x03\x8d\x16\x9f\x8c\x6d\x40\x50\xf5\xec\x05\x01\x38\x78\xa6\x52\x0f\x8c\x9b\xe4\x9b\xd6\x88\x3c\x1f\x1e\xcc\xf4\x3b\x5d\x3e\x98\x55\xe0\xb1\x58\x64\x57\x9a\xa8\xbb\xc0\xee\x5f\xb4\xe5\x03\x76\x52\xc0\xac\x4f\xe1\x74\xde\xdf\xfd\x1f\x00\x00\xff\xff\x42\xeb\x6b\x25\x7f\x05\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x54\xc1\x8e\xe3\x44\x10\xbd\xcf\x57\x14\xb3\x81\x03\xc2\x76\x36\x12\x97\x48\x11\xda\x45\x48\x20\x71\x22\x0b\x1c\x96\x95\xd5\x76\x97\x93\x66\xda\xd5\x9e\xaa\xea\x64\x4c\x26\xfb\xed\xa8\xed\x71\x26\x99\xc9\x6a\x73\x72\xaa\x5e\xbd\x7e\x5d\xef\xd9\x59\x96\xdd\x48\x2f\x8a\xad\x5d\xde\x00\x44\x72\x2a\xe9\x01\x20\x03\x32\x2d\x2e\xc1\x91\xa8\xf1\x1e\x39\x17\xe4\x9d\xab\x71\xe8\x02\x20\x99\xca\xe3\x12\x94\xe3\x54\xaa\x03\x29\x92\xca\x12\x1e\x9f\x2a\x00\x1f\xff\x24\xa7\x9f\x4e\x7f\xff\xc0\xfb\xe8\x18\x65\x45\xa8\xfb\xc0\x77\x59\x20\xef\x08\x73\x35\xbc\x41\x3d\xc1\xde\x35\x8a\xfc\x15\xcc\xc7\xf5\xa8\xe7\x99\xfc\x43\xdf\xe1\x4a\x5c\xdb\x79\x3c\xd5\x7e\x79\xc0\x7a\xad\x86\x75\x55\x84\x4e\x8b\xd3\x6d\x9e\x69\x7e\x1b\x4b\xcf\x34\x7f\x1b\x52\xb4\xef\xfb\x55\x1b\xbd\xba\x2c\x0a\xf2\xf9\xd9\x6f\xe0\xdd\x2e\x38\x0b\x51\x1c\x6d\x40\xb7\x08\xa2\x86\xac\x61\x0b\xeb\xf5\xaf\xd0\x05\x56\x90\x00\x1f\x90\xd9\x34\x81\x5b\x30\x5d\xe7\x7b\xa8\x0d\x51\xd0\x01\x12\x49\x9d\x7f\xe2\xea\x82\x68\xf6\xa4\x2a\x87\xf7\x51\xc1\xd8\xd6\x91\x40\x6b\xfa\x01\xac\x01\x2c\x56\x71\x03\xd6\xc9\xdd\xe4\x06\x74\x1c\x2a\x8f\xad\xe4\x93\xa4\xb4\xb0\xa9\xfb\x03\x88\x6c\x2d\xec\x9d\xf7\x10\x05\x47\x49\x8b\x05\x18\x4a\xaa\x91\xa5\x78\x16\x57\x1b\x4a\xbe\x11\xd6\x9a\x5f\xf8\x9e\x28\x72\x09\xf5\xdd\x69\xe5\x96\x43\xe7\xe8\x29\x1e\xe7\xd0\xb7\xf3\x2c\xa1\xb3\x74\x4e\x5e\x07\x6a\x4e\x88\xeb\x99\x18\xdd\x1b\xa8\x3f\x5d\x14\x7f\x77\xa2\x48\x6b\x65\x34\xed\xea\xcb\x9d\xc5\x62\xb1\xb8\x11\x0d\x6c\x36\x98\xd4\x34\xce\xe3\x29\xb5\x9d\xd1\xed\x12\xae\x9a\x3d\xe0\x86\xb0\x2f\x81\x43\x98\xee\xd5\x06\x8b\x4b\x98\xff\x38\x9f\xbf\xcc\xf1\x49\x82\x1b\x12\x78\x79\x87\x37\xdf\x14\x95\xa3\xa2\x32\xb2\x85\x0c\x1f\xce\x3b\x10\xa9\x0d\x91\x14\x0c\xf5\xe0\xb1\xd1\xb0\x43\x16\x30\x3a\xc4\xa5\xc2\x8d\x23\x4a\xe1\xa9\xb0\x09\x8c\xb0\xc7\xa4\xc1\x35\xfd\xd0\x1e\x7c\x4e\x0f\x23\x45\x14\x94\x33\xee\x38\x56\x0b\x6d\xbb\x22\x60\xdb\x08\x3c\x3e\x9e\xbf\x83\xe9\xe7\x77\xf5\xd6\xd0\x06\x21\x33\x04\x85\xc5\x5d\xd1\x9a\xae\x43\x2e\xbe\xbf\x02\xae\x23\x7b\xc8\x32\x46\xe5\x1e\xde\xce\xe1\x76\x76\x70\x1b\x72\xea\x02\x95\x48\xb6\x0b\x8e\xf4\xf8\xd3\xe1\x90\x33\xde\x47\x14\xcd\xd9\xec\xcb\xfb\x88\xdc\x1f\x8f\xdf\x05\x59\x4d\x4b\xb6\xb7\x90\x05\x98\x46\xf3\x7f\x25\xd0\xd9\x29\x8d\x37\x5a\x1b\x9e\x92\x0e\xff\x5c\xb8\xfb\xed\xe1\x33\xb8\x66\x8a\x6f\xa9\xa1\x94\x36\x71\x8a\x96\xc3\x36\x3e\x1f\x2f\xe0\x99\x5c\x99\x47\x2f\xf8\x0a\x68\x61\x76\x98\x58\x13\xd3\xf1\xda\x20\x59\xd7\xbc\x9a\xfc\x19\x66\x87\x20\x65\x5a\x24\xa1\x7f\x39\x97\xfd\x35\xb6\x93\xad\x2e\xd0\xab\x76\x48\x6b\x4c\x31\x32\x8e\x90\x4b\xef\x28\x3e\x94\x01\xdb\xe3\xed\x0b\xe4\xec\x50\x19\xc1\xc8\xbe\x6c\xbc\xd9\xbc\xe2\x71\x5f\x5c\x68\xb4\xb8\x33\xb6\x05\x41\x55\x7f\xee\xe7\x18\xf0\x5a\x3d\x30\x56\x29\xe4\x9d\x11\xd9\x8f\x5f\xf7\xf4\xee\x5f\x7e\xdd\xeb\xc0\xd3\xb0\xc8\xb6\x34\x51\xb7\x81\xdd\x7f\x68\xcb\x3b\xec\x65\x09\xb3\x43\x2a\xa7\xe7\xe3\xcd\xff\x01\x00\x00\xff\xff\x4d\xfc\x2a\xe9\x2c\x06\x00\x00"), }, "/terraform-modules/matchbox-flatcar/variables.tf": &vfsgen۰CompressedFileInfo{ name: "variables.tf",