various fixes and initial focal support

[automated-distro-installer] / fai / config / files / boot / chboot / DEFAULT

diff --git a/fai/config/files/boot/chboot/DEFAULT b/fai/config/files/boot/chboot/DEFAULT
index 7800764614737e4e871caca7d3f23a1514e4f6b9..7c89c471ea4c220927db3158a7dd7fa14a00c25e 100755 (executable)
--- a/fai/config/files/boot/chboot/DEFAULT
+++ b/fai/config/files/boot/chboot/DEFAULT
@@ -110,7 +110,7 @@ fi
 
 e() { echo "$@"; "$@"; }
 
-for boot_dev in $(s btrfs fil show $mnt | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
+for boot_dev in $(btrfs fil show $mnt | sed -nr 's#.*path\s+(\S+)$#\1#p'); do
 
   mount_point=$(mktemp -d)
 
@@ -129,7 +129,6 @@ e mount $boot_disk$grub_extn $mount_point
 e grub-editenv $mount_point/grubenv set last_boot=/$distro
 e grub-editenv $mount_point/grubenv set did_fai_check=true
 e umount $mount_point
-y
 if $reboot; then
   touch /tmp/keyscript-off
   reboot now