From owner-svn-src-head@freebsd.org Mon Feb 12 14:44:23 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13491F202A3; Mon, 12 Feb 2018 14:44:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B8542774BA; Mon, 12 Feb 2018 14:44:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98472134B0; Mon, 12 Feb 2018 14:44:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1CEiMNK082218; Mon, 12 Feb 2018 14:44:22 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1CEiLTx082212; Mon, 12 Feb 2018 14:44:21 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802121444.w1CEiLTx082212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 12 Feb 2018 14:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329161 - in head: . sbin sbin/devmatch usr.sbin usr.sbin/devmatch X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: . sbin sbin/devmatch usr.sbin usr.sbin/devmatch X-SVN-Commit-Revision: 329161 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2018 14:44:23 -0000 Author: imp Date: Mon Feb 12 14:44:21 2018 New Revision: 329161 URL: https://svnweb.freebsd.org/changeset/base/329161 Log: 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 Added: head/sbin/devmatch/ head/sbin/devmatch/Makefile (contents, props changed) - copied, changed from r329155, head/usr.sbin/devmatch/Makefile head/sbin/devmatch/devmatch.8 (contents, props changed) - copied, changed from r329155, head/usr.sbin/devmatch/devmatch.8 head/sbin/devmatch/devmatch.c (contents, props changed) - copied, changed from r329155, head/usr.sbin/devmatch/devmatch.c Deleted: head/usr.sbin/devmatch/Makefile head/usr.sbin/devmatch/devmatch.8 head/usr.sbin/devmatch/devmatch.c Modified: head/ObsoleteFiles.inc head/sbin/Makefile head/usr.sbin/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Feb 12 13:59:04 2018 (r329160) +++ head/ObsoleteFiles.inc Mon Feb 12 14:44:21 2018 (r329161) @@ -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) Modified: head/sbin/Makefile ============================================================================== --- head/sbin/Makefile Mon Feb 12 13:59:04 2018 (r329160) +++ head/sbin/Makefile Mon Feb 12 14:44:21 2018 (r329161) @@ -12,6 +12,7 @@ SUBDIR=adjkerntz \ conscontrol \ ddb \ devfs \ + devmatch \ dhclient \ dmesg \ dump \ Copied and modified: head/sbin/devmatch/Makefile (from r329155, head/usr.sbin/devmatch/Makefile) ============================================================================== Copied and modified: head/sbin/devmatch/devmatch.8 (from r329155, head/usr.sbin/devmatch/devmatch.8) ============================================================================== Copied and modified: head/sbin/devmatch/devmatch.c (from r329155, head/usr.sbin/devmatch/devmatch.c) ============================================================================== Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Mon Feb 12 13:59:04 2018 (r329160) +++ head/usr.sbin/Makefile Mon Feb 12 14:44:21 2018 (r329161) @@ -21,7 +21,6 @@ SUBDIR= adduser \ dconschat \ devctl \ devinfo \ - devmatch \ diskinfo \ dumpcis \ etcupdate \