diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-11 22:45:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-11 22:45:54 +0000 |
| commit | db5ffb6c72e5da2df4be7190d6f60986dd63d33c (patch) | |
| tree | 4b426d45b853c3bdb39398cdbcbc7dc819fae04c /distrib | |
| parent | 2ecd0fbc33003f6ec5358565cd08bc2d4b275345 (diff) | |
mi get_ifdevs()
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sh | 3 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 9 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index fd613a072ef..42040d1b9e3 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.26 1998/07/13 23:23:19 deraadt Exp $ +# $OpenBSD: install.sh,v 1.27 1998/09/11 22:45:53 millert Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -82,7 +82,6 @@ MODE="install" # md_copy_kernel() - copy a kernel to the installed disk # md_get_diskdevs() - return available disk devices # md_get_cddevs() - return available CD-ROM devices -# md_get_ifdevs() - return available network interfaces # md_get_partition_range() - return range of valid partition letters # md_installboot() - install boot-blocks on disk # md_labeldisk() - put label on a disk diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 82193c5189e..8f6159d93c3 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.79 1998/07/09 00:02:34 millert Exp $ +# $OpenBSD: install.sub,v 1.80 1998/09/11 22:45:52 millert Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -223,6 +223,11 @@ basename () { eval echo \$$# } +get_ifdevs() { + # return available network devices + /sbin/ifconfig -a | egrep -v '^([[:space:]]|(lo|enc|ppp|sl|tun)[[:digit:]])' | cut -f 1 -d : +} + dir_has_sets() { # return true when the directory $1 contains a set for $2...$n local _dir @@ -462,7 +467,7 @@ configurenetwork() { local _ouranswer local _reprompt - _IFS=`md_get_ifdevs` + _IFS=`get_ifdevs` _ifsdone="" _ouranswer="" _reprompt=1 diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index df1fef1a5c9..11311af1969 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: upgrade.sh,v 1.8 1997/07/09 15:15:35 millert Exp $ +# $OpenBSD: upgrade.sh,v 1.9 1998/09/11 22:45:53 millert Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -52,7 +52,6 @@ MODE="upgrade" # md_copy_kernel() - copy a kernel to the installed disk # md_get_diskdevs() - return available disk devices # md_get_cddevs() - return available CD-ROM devices -# md_get_ifdevs() - return available network interfaces # md_get_partition_range() - return range of valid partition letters # md_installboot() - install boot-blocks on disk # md_labeldisk() - put label on a disk |