From c8de959716ed7e32b47c24fe49a1f4785d4ecba1 Mon Sep 17 00:00:00 2001 From: danhusan Date: Wed, 2 Jan 2019 13:55:08 +0100 Subject: 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) --- scripts/vyatta-grub-setup | 6 +++--- 1 file 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 }' \ -- cgit v1.2.3