diff options
author | Daniil Baturin <daniil@baturin.org> | 2019-04-19 04:36:19 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2019-04-19 04:36:19 +0200 |
commit | e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd (patch) | |
tree | 9162952694f2511cfdae0524f235feca56fa43b3 /scripts/build-vmware-image | |
parent | e954d454746b722648277a95230c2cad272ee860 (diff) | |
parent | 4700953e297af1d07215b81f9490eceeae98e7a0 (diff) | |
download | vyos-build-e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd.tar.gz vyos-build-e6bb8072e00da2e698fb472d3c8c18f9cecfd3dd.zip |
Merge branch 'current' of https://github.com/vyos/vyos-build into current
Diffstat (limited to 'scripts/build-vmware-image')
-rwxr-xr-x | scripts/build-vmware-image | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image index 5ad6615a..dc680378 100755 --- a/scripts/build-vmware-image +++ b/scripts/build-vmware-image @@ -142,22 +142,22 @@ set timeout=5 set default=0 menuentry "VyOS (KVM console)" { - linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,9600 console=tty0 systemd.show_status=true + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=ttyS0,115200 console=tty0 systemd.show_status=true initrd /boot/"$version"/initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=ttyS0,9600 console=tty0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=ttyS0,115200 console=tty0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } menuentry "VyOS $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,9600n8d consoleblank=0 systemd.show_status=true + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8d consoleblank=0 systemd.show_status=true initrd /boot/"$version"/initrd.img } menuentry "Lost password change $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,9600n8d consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8d consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF |