diff options
| author | John Estabrook <jestabro@sentrium.io> | 2019-04-16 13:40:00 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@sentrium.io> | 2019-04-16 13:47:51 -0500 |
| commit | 4700953e297af1d07215b81f9490eceeae98e7a0 (patch) | |
| tree | 9162952694f2511cfdae0524f235feca56fa43b3 /data | |
| parent | acf492894fe8a9cda5ccc6cecf4c1033299e36ee (diff) | |
| download | vyos-build-4700953e297af1d07215b81f9490eceeae98e7a0.tar.gz vyos-build-4700953e297af1d07215b81f9490eceeae98e7a0.zip | |
T1327: Set the serial console speed to 115200 by default
Set the serial console speed to 115200 in all build scripts, as is the
standard for current boards. This avoids an annoyance for users of the
livecd, and makes the defaults in build scripts in tools/ and scripts/
consistent.
Diffstat (limited to 'data')
3 files changed, 7 insertions, 7 deletions
diff --git a/data/live-build-config/hooks/live/05-event_tty.chroot b/data/live-build-config/hooks/live/05-event_tty.chroot index a00167f7..81ef6257 100755 --- a/data/live-build-config/hooks/live/05-event_tty.chroot +++ b/data/live-build-config/hooks/live/05-event_tty.chroot @@ -22,7 +22,7 @@ if [ -r etc/event.d/tty1 ] ; then stop on runlevel 6 respawn - exec /sbin/getty 9600 ttyS0 vt100 + exec /sbin/getty 115200 ttyS0 vt100 EOF fi @@ -30,5 +30,5 @@ fi if [ -r etc/inittab ] && [ -c dev/ttyS0 ] && grep -q '^#T0:.*getty.*ttyS0' etc/inittab ; then echo I: Enable serial console login - sed -i '/^#T0:/s|^#.*$|T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100|' etc/inittab + sed -i '/^#T0:/s|^#.*$|T0:23:respawn:/sbin/getty -L ttyS0 115200 vt100|' etc/inittab fi diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default index 1509ac85..9a98fb05 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default @@ -26,7 +26,7 @@ system { } console { device ttyS0 { - speed 9600 + speed 115200 } } config-management { 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 ae34e4ee..516b8b78 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 rootdelay=5 vyos-union=/boot/ console=ttyS0,9600 console=tty0 + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,115200 console=tty0 initrd /boot//initrd.img } menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,9600 + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,115200 initrd /boot//initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 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,115200 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 rootdelay=5 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,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } |