summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2018-09-05 16:44:03 +0200
committertorben2018-09-05 16:44:03 +0200
commitb914ce47f4c58ac805b4b0c7f6f49c00a47591e2 (patch)
treee93a207213463299ad56c851368eecdc3213bc66
parentImprove boot partition installation. (diff)
downloadsystemd-init-b914ce47f4c58ac805b4b0c7f6f49c00a47591e2.tar.gz
systemd-init-b914ce47f4c58ac805b4b0c7f6f49c00a47591e2.tar.xz
systemd-init-b914ce47f4c58ac805b4b0c7f6f49c00a47591e2.zip
fix many offline boot bugs
-rwxr-xr-xmodules.d/dnbd-root-filesystem/hooks/update-boot-files.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
index a54b574b..528e0cfa 100755
--- a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
+++ b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh
@@ -165,7 +165,7 @@ bl.exception.try {
seek=TODO
else
if ! fdisk --list "$device_path" | \
- grep "^$device_path +\*" &>/dev/null
+ grep --extended-regexp "^$device_path +\*" &>/dev/null
then
bl.logging.info \
Set the \"boot\" flag to mbr based boot \
@@ -188,7 +188,7 @@ EOF
fi
cat << EOF > /mnt/syslinux/syslinux.cfg
PROMPT 1
-TIMEOUT 50
+TIMEOUT 1
DEFAULT arch
LABEL arch
@@ -281,6 +281,9 @@ EOF
fi
# endregion
if $kernel_passed && $initramfs_passed; then
+ if [ ! -f /mnt/slx_boot ]; then
+ echo / >/mnt/slx_boot
+ fi
break
fi
done