From 4700953e297af1d07215b81f9490eceeae98e7a0 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Tue, 16 Apr 2019 13:40:00 -0500
Subject: 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.
---
data/live-build-config/hooks/live/05-event_tty.chroot | 4 ++--
.../includes.chroot/opt/vyatta/etc/config.boot.default | 2 +-
.../includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 ++++----
scripts/build-vmware-image | 8 ++++----
tools/cloud-init/AWS/config.boot.default | 2 +-
tools/cloud-init/OCI/config.boot.default | 2 +-
6 files changed, 13 insertions(+), 13 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
}
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
diff --git a/tools/cloud-init/AWS/config.boot.default b/tools/cloud-init/AWS/config.boot.default
index de724f0b..4e556a5d 100644
--- a/tools/cloud-init/AWS/config.boot.default
+++ b/tools/cloud-init/AWS/config.boot.default
@@ -26,7 +26,7 @@ system {
}
console {
device ttyS0 {
- speed 9600
+ speed 115200
}
}
config-management {
diff --git a/tools/cloud-init/OCI/config.boot.default b/tools/cloud-init/OCI/config.boot.default
index 18f6ef09..296c690a 100644
--- a/tools/cloud-init/OCI/config.boot.default
+++ b/tools/cloud-init/OCI/config.boot.default
@@ -16,7 +16,7 @@ system {
}
console {
device ttyS0 {
- speed 9600
+ speed 115200
}
}
config-management {
--
cgit v1.2.3