Sat May 29 23:46:14 2021 UTC ()

Handle recent ifconfig(8) outputs in the miniroot installation script.

- Remove netmask slash notation for IP addresses,
  which has been changed between NetBSD 7.x and 8.0:
  http://cvsweb.netbsd.org/bsdweb.cgi/src/sbin/ifconfig/af_inet.c#rev1.24
- Ignore inet6 entries, which miniroot scripts don't support

Should be pulled up to netbsd-9 and netbsd-8.


(tsutsui)

diff -r1.59 -r1.60 src/distrib/miniroot/install.sub

--- src/distrib/miniroot/install.sub 2020/12/12 05:23:21	1.59
+++ src/distrib/miniroot/install.sub 2021/05/29 23:46:14	1.60

 @@ -1,15 +1,15 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.59 2020/12/12 05:23:21 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.60 2021/05/29 23:46:14 tsutsui Exp $
+#
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Jason R. Thorpe.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -393,28 +393,29 @@ configure_ifs() {
 		/^[ 	]*media autoselect/d
 ,$s/[ 	]*media //p')
 	# get current "media" "ip" and "netmask" ("broadcast")
 	_t=$(ifconfig $_interface_name | sed -n '
 		s/^[ 	]*media: [^ 	]* \([^ ][^ ]*\).*/\1/p')
 	if [ "$_t" != "manual" ] && [ "$_t" != "media:" ] && [ "$_t" != "autoselect" ];
 	then
 		_interface_mediumtype=$1
 	fi
 	set -- $(ifconfig $_interface_name | sed -n '
-		/^[ 	]*inet/{
+		/^[ 	]*inet /{
 		s/inet//
 		s,/[0-9]*,,
 		s/--> [0-9.][0-9.]*//
 		s/netmask//
 		s/broadcast//
 		p;}')
 	_interface_ip=$1
 	_interface_mask=$2
 	# Get IP address
 	resp=""		# force one iteration
 	while [ -z "${resp}" ]; do
 		echo -n "IP address? [$_interface_ip] "
 		getresp "$_interface_ip"