diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-01-02 17:36:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 17:36:33 +0100 |
| commit | 57dfa72fdfbdc60a4cd1b3f421242376ce19b509 (patch) | |
| tree | c90793d4d3168c1180b8e334bb26b40125a29abd | |
| parent | 23e35e77feca41b5ef0efee80832c7106d7862ab (diff) | |
| parent | 32ac33cd318e1d30e20f8cd10f396a88640753ee (diff) | |
| download | vyos-build-57dfa72fdfbdc60a4cd1b3f421242376ce19b509.tar.gz vyos-build-57dfa72fdfbdc60a4cd1b3f421242376ce19b509.zip | |
Merge pull request #35 from danhusan/patch-1
T1120: Add rootdelay=5 by default in grub.cfg
| -rw-r--r-- | data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 |
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 } |