iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4029016
)
fix chboot bug introduced in its last change
author
Ian Kelling
<ian@iankelling.org>
Wed, 31 May 2017 04:46:26 +0000
(21:46 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Wed, 31 May 2017 04:46:26 +0000
(21:46 -0700)
fai/config/files/boot/chboot/DEFAULT
patch
|
blob
|
history
diff --git
a/fai/config/files/boot/chboot/DEFAULT
b/fai/config/files/boot/chboot/DEFAULT
index a8aa58497c386e94d3f5c676191530b56d520c49..a7b450a4793a357955082e73ec459c4b3fc083c9 100755
(executable)
--- a/
fai/config/files/boot/chboot/DEFAULT
+++ b/
fai/config/files/boot/chboot/DEFAULT
@@
-93,8
+93,8
@@
fi
#### begin initial error checking #####
#### 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
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 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
e grub-editenv $mount_point/grubenv set did_fai_check=true
e umount $mount_point
e rmdir $mount_point