From owner-svn-src-all@FreeBSD.ORG Wed Oct 9 20:47:21 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E1749B02; Wed, 9 Oct 2013 20:47:21 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B3A4124A9; Wed, 9 Oct 2013 20:47:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99KlLYx018832; Wed, 9 Oct 2013 20:47:21 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99KlK4o018827; Wed, 9 Oct 2013 20:47:20 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310092047.r99KlK4o018827@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 20:47:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256241 - in head: . bin bin/freebsd-version libexec libexec/freebsd-version X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 20:47:22 -0000 Author: des Date: Wed Oct 9 20:47:20 2013 New Revision: 256241 URL: http://svnweb.freebsd.org/changeset/base/256241 Log: By popular demand, move freebsd-version(1) from /libexec to /bin. Approved by: re (gjb) Added: head/bin/freebsd-version/ - copied from r256237, head/libexec/freebsd-version/ Deleted: head/libexec/freebsd-version/ Modified: head/ObsoleteFiles.inc head/bin/Makefile head/bin/freebsd-version/Makefile head/bin/freebsd-version/freebsd-version.1 head/libexec/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Oct 9 20:14:16 2013 (r256240) +++ head/ObsoleteFiles.inc Wed Oct 9 20:47:20 2013 (r256241) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib Modified: head/bin/Makefile ============================================================================== --- head/bin/Makefile Wed Oct 9 20:14:16 2013 (r256240) +++ head/bin/Makefile Wed Oct 9 20:47:20 2013 (r256241) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: head/bin/freebsd-version/Makefile ============================================================================== --- head/libexec/freebsd-version/Makefile Wed Oct 9 20:00:04 2013 (r256237) +++ head/bin/freebsd-version/Makefile Wed Oct 9 20:47:20 2013 (r256241) @@ -2,7 +2,6 @@ SCRIPTS = freebsd-version MAN = freebsd-version.1 -BINDIR = /libexec CLEANFILES = freebsd-version.sh NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh Modified: head/bin/freebsd-version/freebsd-version.1 ============================================================================== --- head/libexec/freebsd-version/freebsd-version.1 Wed Oct 9 20:00:04 2013 (r256237) +++ head/bin/freebsd-version/freebsd-version.1 Wed Oct 9 20:47:20 2013 (r256241) @@ -100,13 +100,13 @@ and the kernel. .Sh EXAMPLES To determine the version of the currently running userland: .Bd -literal -offset indent -/libexec/freebsd-version -u +/bin/freebsd-version -u .Ed .Pp To inspect a system being repaired using a live CD: .Bd -literal -offset indent mount -rt ufs /dev/ada0p2 /mnt -env ROOT=/mnt /mnt/libexec/freebsd-version -ku +env ROOT=/mnt /mnt/bin/freebsd-version -ku .Ed .Sh SEE ALSO .Xr uname 1 , Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Wed Oct 9 20:14:16 2013 (r256240) +++ head/libexec/Makefile Wed Oct 9 20:47:20 2013 (r256241) @@ -8,7 +8,6 @@ SUBDIR= ${_atf} \ bootpd \ ${_comsat} \ fingerd \ - freebsd-version \ ftpd \ getty \ ${_mail.local} \