summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2014-02-03 23:28:01 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2014-02-03 23:28:01 +0000
commit4dcef1885ede5e03bf20c4dad25f2c8651f514fd (patch)
treeef9ca72a635f5efa3996fa2ac0321ab93159480c /distrib/miniroot/install.sub
parent52035c05042e3667271aa8fc4f40a14a5ac2b8dc (diff)
Use get_ifdevs() to get the name of a possibly existing netboot
interface instead of using handrolled ifconfig | sed combo. OK halex@ krw@
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 4f3f0fd63fc..81eae2851ea 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.741 2014/02/02 19:33:23 rpe Exp $
+# $OpenBSD: install.sub,v 1.742 2014/02/03 23:28:00 rpe Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -663,7 +663,7 @@ configure_ifs() {
ask_which "network interface" "do you wish to configure" \
'$(get_ifdevs)' \
- ${_p:-'$( (ifconfig netboot 2>/dev/null | sed -n '\''1s/:.*//p'\''; get_ifdevs) | sed q )'}
+ ${_p:-'$( (get_ifdevs netboot; get_ifdevs) | sed q )'}
[[ $resp == done ]] && break
_ifs=$resp