From 590682b6e6b2b86fc0bc8c9507444e4392c6efd2 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 12 Feb 2018 14:44:21 +0000 Subject: [PATCH] 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 --- ObsoleteFiles.inc | 2 ++ sbin/Makefile | 1 + {usr.sbin => sbin}/devmatch/Makefile | 0 {usr.sbin => sbin}/devmatch/devmatch.8 | 0 {usr.sbin => sbin}/devmatch/devmatch.c | 0 usr.sbin/Makefile | 1 - 6 files changed, 3 insertions(+), 1 deletion(-) rename {usr.sbin => sbin}/devmatch/Makefile (100%) rename {usr.sbin => sbin}/devmatch/devmatch.8 (100%) rename {usr.sbin => sbin}/devmatch/devmatch.c (100%) 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 similarity index 100% rename from usr.sbin/devmatch/Makefile rename to sbin/devmatch/Makefile diff --git a/usr.sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 similarity index 100% rename from usr.sbin/devmatch/devmatch.8 rename to sbin/devmatch/devmatch.8 diff --git a/usr.sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c similarity index 100% rename from usr.sbin/devmatch/devmatch.c rename to 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 \