diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-12-17 03:06:12 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-12-17 03:06:12 +0100 |
| commit | 093cab9d244d6bfbccac2edc4f2a5c2c5f8a5cd0 (patch) | |
| tree | 101a3810280de63163dcef8be2bcf4c0831d2022 | |
| parent | bdc97cb53126e17a6f7111daaf19ae95dbc4aa5a (diff) | |
| parent | efaec8e4546a0e105ba717cd72cbed00e7b6202d (diff) | |
| download | vyos-build-093cab9d244d6bfbccac2edc4f2a5c2c5f8a5cd0.tar.gz vyos-build-093cab9d244d6bfbccac2edc4f2a5c2c5f8a5cd0.zip | |
Merge branch 'current' of github.com:vyos/vyos-build into current
| -rwxr-xr-x | scripts/build-azure-image | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build-azure-image b/scripts/build-azure-image index d47b4351..b31c9fce 100755 --- a/scripts/build-azure-image +++ b/scripts/build-azure-image @@ -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 |