For architectures with an enabled 'console' ttys entry, adjust the

speed of said entry to reflect the speed of the console being used to
install.

For archs with MDSERIAL defined, offer the current device and speed as
the defaults for switching to serial consoles.

Fixes new Sun gear that uses a 115200 console speed and makes for
better defaults without breaking current install processes.

ok dlg@ henning@

2 files changed, 27 insertions, 5 deletions

diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index c3d25ee0d79..b0679df9ccd 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sh,v 1.154 2006/08/29 01:02:49 krw Exp $
+#	$OpenBSD: install.sh,v 1.155 2008/02/11 23:40:03 krw Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback
@@ -361,6 +361,12 @@ while read _dev _mp _fstype _opt _rest; do
 	mount -u -o $_opt $_dev $_mp ||	exit
 done </etc/fstab
 
+# Ensure an enabled console has the correct speed in /etc/ttys.
+sed -e "/^console.*on.*secure.*$/s/std\.[0-9]*/std.$(stty speed)/" \
+	/mnt/etc/ttys >/tmp/ttys
+# Move ttys back in case questions() needs to massage it more.
+mv /tmp/ttys /mnt/etc/ttys
+
 # Handle questions...
 questions
 
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6fb1a632562..1f84d550d57 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.422 2007/12/14 08:30:11 otto Exp $
+#	$OpenBSD: install.sub,v 1.423 2008/02/11 23:40:03 krw Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback
@@ -217,6 +217,15 @@ get_serialdev() {
 	echo "$_bd$1 $_td$1"
 }
 
+get_console() {
+	local _d
+
+	# Find '<dev>: console' and extract <dev>.
+	_d=$(sed -ne '/^\([^ ]*\): console$/s//\1/p' /var/run/dmesg.boot)
+	set -- $MDSERIAL
+	[[ ${_d%[0-9]} == $1 ]] && echo "$2${_d##*[a-z]} $3${_d##*[a-z]}"
+}
+
 get_drive() {
 	ask_which "$1" "contains the $MODE media" "$2"
 	[[ $resp == done ]] && return 1
@@ -1528,7 +1537,7 @@ populateusrlocal() {
 }
 
 questions() {
-	local _bd _td
+	local _bd _td _sp
 
 	ask_yn "Start sshd(8) by default?" yes
 	if [[ $resp == n ]]; then
@@ -1561,12 +1570,19 @@ server $1
 	fi
 
 	[[ -z $SERIALDEV ]] && return
-	set -- $SERIALDEV
+	set -- $(get_console)
+	if [[ -n $1 && -n $2 ]]; then
+		# When installing via a serial console use it and current speed.
+		_sp=$(stty speed)
+	else
+		# Use first serial port and 9600 (i.e. leave _sp unset).
+		set -- $SERIALDEV
+	fi
 	_bd=$1
 	_td=$2
 	ask_yn "Change the default console to $_bd?"
 	[[ $resp == n ]] && return
-	ask_which "speed" "should $_bd use" "9600 19200 38400 57600 115200"
+	ask_which "speed" "should $_bd use" "9600 19200 38400 57600 115200" $_sp
 	[[ $resp == done ]] && return
 	echo "stty $_bd $resp\nset tty $_bd" >>/mnt/etc/boot.conf
 	sed	-e "/^${_td}/s/std.9600/std.${resp}/" \