From: Ian Kelling <ian@iankelling.org>
Date: Wed, 31 May 2017 04:46:26 +0000 (-0700)
Subject: fix chboot bug introduced in its last change
X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=commitdiff_plain;h=4dc0fcef55f5610af47b83febae7a641b6c6c8e5

fix chboot bug introduced in its last change
---

diff --git a/fai/config/files/boot/chboot/DEFAULT b/fai/config/files/boot/chboot/DEFAULT
index a8aa584..a7b450a 100755
--- a/fai/config/files/boot/chboot/DEFAULT
+++ b/fai/config/files/boot/chboot/DEFAULT
@@ -93,8 +93,8 @@ fi
 
 #### begin initial error checking #####
 
-if ! btrfs subvolume list $mnt | grep "_$distro$" &>/dev/null; then
-    echo "$0: error: _$distro$ not found in btrfs subvolume list $mnt:"
+if ! btrfs subvolume list $mnt | grep "$distro$" &>/dev/null; then
+    echo "$0: error: $distro not found in btrfs subvolume list $mnt:"
     btrfs subvolume list $mnt
     exit 1
 fi
@@ -119,7 +119,7 @@ e grub-bios-setup -d $mount_point/grub/i386-pc -s -m $mount_point/grub/device.ma
 e umount $mount_point
 
 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 last_boot=/$distro
 e grub-editenv $mount_point/grubenv set did_fai_check=true
 e umount $mount_point
 e rmdir $mount_point