summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanhusan <daniel@fnutt.net>2019-01-02 13:56:03 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-02 17:37:22 +0100
commitc7fb71488763ebe41277cfd8571f47f2510c9797 (patch)
tree53b4db8707bdd7e13422f517578b4110b72a2465
parent15a9a405e03165b798776b9f779426bdfa779d03 (diff)
downloadvyos-build-c7fb71488763ebe41277cfd8571f47f2510c9797.tar.gz
vyos-build-c7fb71488763ebe41277cfd8571f47f2510c9797.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 32ac33cd318e1d30e20f8cd10f396a88640753ee)
-rw-r--r--data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
index 4107e459..ae34e4ee 100644
--- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
+++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
@@ -1,20 +1,20 @@
menuentry "VyOS (KVM console)" {
- linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,9600 console=tty0
initrd /boot//initrd.img
}
menuentry "VyOS (Serial console)" {
- linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,9600
initrd /boot//initrd.img
}
menuentry "Lost password change (KVM console)" {
- linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset
initrd /boot//initrd.img
}
menuentry "Lost password change (Serial console)" {
- linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset
initrd /boot//initrd.img
}