From owner-svn-src-all@freebsd.org Sun May 15 05:38:48 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D043AB3C237; Sun, 15 May 2016 05:38:48 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 73D6D17F2; Sun, 15 May 2016 05:38:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4F5clfH098533; Sun, 15 May 2016 05:38:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4F5cl8e098530; Sun, 15 May 2016 05:38:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605150538.u4F5cl8e098530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 May 2016 05:38:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299842 - in head: etc/rc.d tools/build/mk 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.22 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: Sun, 15 May 2016 05:38:48 -0000 Author: ngie Date: Sun May 15 05:38:47 2016 New Revision: 299842 URL: https://svnweb.freebsd.org/changeset/base/299842 Log: Conditionalize installing etc/rc.d/atm{1,2,3} `BEFORE: netif` was already in etc/rc.d/atm1, so no additional changes are needed in that script MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/etc/rc.d/Makefile head/etc/rc.d/netif head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Sun May 15 05:22:15 2016 (r299841) +++ head/etc/rc.d/Makefile Sun May 15 05:38:47 2016 (r299842) @@ -14,9 +14,6 @@ FILES= DAEMON \ addswap \ adjkerntz \ archdep \ - atm1 \ - atm2 \ - atm3 \ auditd \ auditdistd \ bgfsck \ @@ -157,6 +154,14 @@ APM+= apmd APMPACKAGE= apm .endif +.if ${MK_ATM} != "no" +FILESGROUPS+= ATM +ATM+= atm1 +ATM+= atm2 +ATM+= atm3 +ATMPACKAGE= atm +.endif + .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd Modified: head/etc/rc.d/netif ============================================================================== --- head/etc/rc.d/netif Sun May 15 05:22:15 2016 (r299841) +++ head/etc/rc.d/netif Sun May 15 05:38:47 2016 (r299842) @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl +# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 15 05:22:15 2016 (r299841) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 15 05:38:47 2016 (r299842) @@ -76,6 +76,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz .endif .if ${MK_ATM} == no +OLD_FILES+=etc/rc.d/atm1 +OLD_FILES+=etc/rc.d/atm2 +OLD_FILES+=etc/rc.d/atm3 OLD_FILES+=rescue/atmconfig OLD_FILES+=sbin/atmconfig OLD_FILES+=usr/bin/sscop