summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2018-02-12 14:44:21 +0000
committerWarner Losh <imp@FreeBSD.org>2018-02-12 14:44:21 +0000
commit590682b6e6b2b86fc0bc8c9507444e4392c6efd2 (patch)
tree6cd2b6ad0986a372938952547cff32f61923762f
parentff99e2821062964b7e2c591b8314393d9f8bddc4 (diff)
downloadsrc-test2-590682b6e6b2b86fc0bc8c9507444e4392c6efd2.tar.gz
src-test2-590682b6e6b2b86fc0bc8c9507444e4392c6efd2.zip
Move devmatch to sbin from usr/sbin.
Since we want to use devmatch in context before a split /,/usr system has mounted /usr, move devmatch to /sbin. Sponsored by: Netflix
Notes
Notes: svn path=/head/; revision=329161
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--sbin/Makefile1
-rw-r--r--sbin/devmatch/Makefile (renamed from usr.sbin/devmatch/Makefile)0
-rw-r--r--sbin/devmatch/devmatch.8 (renamed from usr.sbin/devmatch/devmatch.8)0
-rw-r--r--sbin/devmatch/devmatch.c (renamed from usr.sbin/devmatch/devmatch.c)0
-rw-r--r--usr.sbin/Makefile1
6 files changed, 3 insertions, 1 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 254fa755b2c9..bb7ed214581b 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180212: move devmatch
+OLD_FILES+=usr/sbin/devmatch
# 20180211: remove usb.conf
OLD_FILES+=etc/devd/usb.conf
# 20180208: remove c_rehash(1)
diff --git a/sbin/Makefile b/sbin/Makefile
index ca9f42ec0d6b..800de288f749 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -12,6 +12,7 @@ SUBDIR=adjkerntz \
conscontrol \
ddb \
devfs \
+ devmatch \
dhclient \
dmesg \
dump \
diff --git a/usr.sbin/devmatch/Makefile b/sbin/devmatch/Makefile
index 6622bdb284d1..6622bdb284d1 100644
--- a/usr.sbin/devmatch/Makefile
+++ b/sbin/devmatch/Makefile
diff --git a/usr.sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8
index d8242e294ef2..d8242e294ef2 100644
--- a/usr.sbin/devmatch/devmatch.8
+++ b/sbin/devmatch/devmatch.8
diff --git a/usr.sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c
index 9efeb9377ac7..9efeb9377ac7 100644
--- a/usr.sbin/devmatch/devmatch.c
+++ b/sbin/devmatch/devmatch.c
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f6597850d69f..d1338324214b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -21,7 +21,6 @@ SUBDIR= adduser \
dconschat \
devctl \
devinfo \
- devmatch \
diskinfo \
dumpcis \
etcupdate \