use another detection method

diff --git a/bootstrap.sh b/bootstrap.sh
index dc9641b9ab98ecd34133d0ff2dec0b10dfbd1d66..4fe57bf63aa9430d3ace8155388a0bda8155453c 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,8 +78,6 @@ build_rootfs()
 
         cd testing
 
 
         cd testing
 

-        sudo rm etc/fstab
-

         sudo mkdir -p boot/efi
 
         sudo bash -c 'echo live > etc/hostname'
         sudo mkdir -p boot/efi
 
         sudo bash -c 'echo live > etc/hostname'


@@ -132,7 +130,6 @@ build_dd()
         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/

-        sudo touch mnt/etc/fstab

         sudo rm mnt/init
         sudo umount mnt
         tar cf - media | pigz > m1.tgz
         sudo rm mnt/init
         sudo umount mnt
         tar cf - media | pigz > m1.tgz

diff --git a/files/rc.local b/files/rc.local
index 68ebbc049470ae060a6cdb549d777bbb594b043c..e6f9c6d205651639807396e78ed46e35c6870c2b 100755 (executable)
--- a/files/rc.local
+++ b/files/rc.local
@@ -86,7 +86,6 @@ generate_fstab
 
         open(FSTAB, '>', '/etc/fstab') || die ("Can not open fstab");
         print FSTAB <<EOF;
 
         open(FSTAB, '>', '/etc/fstab') || die ("Can not open fstab");
         print FSTAB <<EOF;

-

 UUID="$root_fs_uuid" /         ext4 defaults 0 0
 UUID="$efi_fs_uuid"  /boot/efi vfat defaults 0 0
 EOF
 UUID="$root_fs_uuid" /         ext4 defaults 0 0
 UUID="$efi_fs_uuid"  /boot/efi vfat defaults 0 0
 EOF


@@ -131,7 +130,7 @@ my $root_fs_uuid = undef;
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 
 my $efi_block_device = undef;
 my $efi_fs_uuid = undef;
 

-unless (-f '/etc/fstab') {
+unless (-f '/boot/grub/grub.cfg') {

         $root_block_device = find_root_device();
         system("resize2fs $root_block_device");
         $root_fs_uuid = find_fs_uuid_of_device($root_block_device);
         $root_block_device = find_root_device();
         system("resize2fs $root_block_device");
         $root_fs_uuid = find_fs_uuid_of_device($root_block_device);