Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/miniroot Handle recent ifconfig(8) outputs in the mi...



details:   https://anonhg.NetBSD.org/src/rev/44f8ceece17b
branches:  trunk
changeset: 983577:44f8ceece17b
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat May 29 23:46:14 2021 +0000

description:
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.

diffstat:

 distrib/miniroot/install.sub |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 390760d39801 -r 44f8ceece17b distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Sat May 29 23:27:22 2021 +0000
+++ b/distrib/miniroot/install.sub      Sat May 29 23:46:14 2021 +0000
@@ -1,5 +1,5 @@
 #!/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.
@@ -403,8 +403,9 @@
        fi
 
        set -- $(ifconfig $_interface_name | sed -n '
-               /^[     ]*inet/{
+               /^[     ]*inet /{
                s/inet//
+               s,/[0-9]*,,
                s/--> [0-9.][0-9.]*//
                s/netmask//
                s/broadcast//



Home | Main Index | Thread Index | Old Index