Merge branch 'current' of github.com:vyos/vyos-build into current

This commit is contained in:
Daniil Baturin 2018-12-17 03:06:12 +01:00
commit 093cab9d24

View File

@ -127,12 +127,12 @@ set timeout=5
set default=0
menuentry "VyOS $version (Serial console)" {
linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true
linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 consoleblank=0 systemd.show_status=true
initrd /boot/"$version"/initrd.img
}
menuentry "Lost password change $version (Serial console)" {
linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset
linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset
initrd /boot/"$version"/initrd.img
}
EOF