summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanhusan <daniel@fnutt.net>2019-01-02 13:55:08 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-02 17:20:04 +0100
commitc8de959716ed7e32b47c24fe49a1f4785d4ecba1 (patch)
tree2cc9b184ee55c3375ed9ec7df921303b2237cf33
parentcf151e597dafd1738f984d4f70eb4b0f5fe27985 (diff)
downloadvyatta-cfg-system-c8de959716ed7e32b47c24fe49a1f4785d4ecba1.tar.gz
vyatta-cfg-system-c8de959716ed7e32b47c24fe49a1f4785d4ecba1.zip
T1120: Add rootdelay=5 by default in grub.cfg
Let disks settle to workaround issue with MD array not being detected. (cherry picked from commit adc147788603eb39ab83bd2736f4c19cd6b524d8)
-rwxr-xr-xscripts/vyatta-grub-setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 2b7197c1..995b5c8a 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -60,9 +60,9 @@ ROOTFSDIR="$3"
# Grub options
if [ "$GRUB_OPTIONS" ]
then
- GRUB_OPTIONS="$GRUB_OPTIONS quiet"
+ GRUB_OPTIONS="$GRUB_OPTIONS quiet rootdelay=5"
else
- GRUB_OPTIONS=quiet
+ GRUB_OPTIONS="quiet rootdelay=5"
fi
# Path to standalone root password reset script
@@ -103,7 +103,7 @@ else
fi
if eval "$UNION"; then
- GRUB_OPTIONS="boot=live quiet vyos-union=/boot/$livedir"
+ GRUB_OPTIONS="boot=live quiet rootdelay=5 vyos-union=/boot/$livedir"
union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \
2>/dev/null \
| awk -F/ '{ print $6 }' \