summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-04-19 00:59:40 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-04-19 00:59:40 +0000
commit83bae1123e16bfaa8db83b84241a3cc1be61bf09 (patch)
tree7d29d8d190a2ba7d47be8ab36723f8f4b3216eea /distrib/miniroot
parent2e748f2a763c37516476f31741fc6badd09c05d7 (diff)
Use sysctl -n hw.disknames instead of the custom disknames program
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub4
-rw-r--r--distrib/miniroot/list4
2 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 5ae07304a8c..9a6053529bd 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.463 2009/04/19 00:00:35 krw Exp $
+# $OpenBSD: install.sub,v 1.464 2009/04/19 00:59:39 deraadt 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
@@ -171,7 +171,7 @@ scan_dmesg() {
scan_disknames() {
local _n _oifs=$IFS
IFS=","
- bsort $(for _n in $(disknames); do echo "$_n "; done | sed -ne "$1")
+ bsort $(for _n in $(sysctl -n hw.disknames); do echo "$_n "; done | sed -ne "$1")
IFS=$_oifs
}
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index d67a6323c05..67db77ffbfe 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.41 2009/04/17 07:18:55 deraadt Exp $
+# $OpenBSD: list,v 1.42 2009/04/19 00:59:39 deraadt Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -47,7 +47,7 @@ LINK instbin sbin/umount
LINK instbin usr/bin/ftp
LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
LINK instbin usr/bin/sed
-LINK instbin usr/bin/disknames
+LINK instbin sbin/sysctl
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group