dont give filesystems new ids

diff --git a/bootstrap.sh b/bootstrap.sh
index e7729aa6b41fe0842ace8c5a6b6963beb2cccac8..2a5aa94cb96c4a97501cf8faf60451e64de34b8e 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -122,7 +122,7 @@ build_dd()
         rm -f media
         dd if=/dev/zero of=media bs=1 count=0 seek=1G
         mkdir -p mnt
         rm -f media
         dd if=/dev/zero of=media bs=1 count=0 seek=1G
         mkdir -p mnt

-        mkfs.ext4 -O ^metadata_csum media
+        mkfs.ext4 -O media

         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
         sudo mount -o loop media mnt
         sudo cp -a testing/* mnt/
         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
         sudo mount -o loop media mnt
         sudo cp -a testing/* mnt/

diff --git a/files/rc.local b/files/rc.local
index 597acd10ad4faac2139502bc1cb6626480649b67..74780d41be177da565af82274ac61cb321c43217 100755 (executable)
--- a/files/rc.local
+++ b/files/rc.local
@@ -119,7 +119,6 @@ update_wifi_firmware_if_necessary
 
 my $root_block_device = undef;
 my $initial_root_fs_uuid = undef;
 
 my $root_block_device = undef;
 my $initial_root_fs_uuid = undef;

-my $final_root_fs_uuid = undef;

 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 


@@ -128,11 +127,8 @@ unless (-f '/boot/grub/grub.cfg') {
         system("resize2fs $root_block_device");
         $initial_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
         $efi_block_device = find_efi_parition($initial_root_fs_uuid);
         system("resize2fs $root_block_device");
         $initial_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
         $efi_block_device = find_efi_parition($initial_root_fs_uuid);

-        system("mlabel -s -n :: -i $efi_block_device");
-        system("tune2fs -U random ${root_block_device}");

         $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);
         $efi_fs_uuid = find_fs_uuid_of_device($efi_block_device);

-        $final_root_fs_uuid = find_fs_uuid_of_device($root_block_device);
-        generate_fstab($final_root_fs_uuid, $efi_fs_uuid);
+        generate_fstab($initial_root_fs_uuid, $efi_fs_uuid);

         system('mount /boot/efi');
         install_grub();
 }
         system('mount /boot/efi');
         install_grub();
 }