From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:21:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B216D351; Sun, 30 Nov 2014 00:21:08 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84955A14; Sun, 30 Nov 2014 00:21:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0L839002489; Sun, 30 Nov 2014 00:21:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0L78q002483; Sun, 30 Nov 2014 00:21:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300021.sAU0L78q002483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:21:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275283 - projects/building-blocks/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:21:08 -0000 Author: ngie Date: Sun Nov 30 00:21:06 2014 New Revision: 275283 URL: https://svnweb.freebsd.org/changeset/base/275283 Log: Rework rc.d requirements so zfs and zvol come before relevant services so they can be decoupled from the build Modified: projects/building-blocks/etc/rc.d/FILESYSTEMS projects/building-blocks/etc/rc.d/dumpon projects/building-blocks/etc/rc.d/var projects/building-blocks/etc/rc.d/zfs projects/building-blocks/etc/rc.d/zvol Modified: projects/building-blocks/etc/rc.d/FILESYSTEMS ============================================================================== --- projects/building-blocks/etc/rc.d/FILESYSTEMS Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/FILESYSTEMS Sun Nov 30 00:21:06 2014 (r275283) @@ -4,7 +4,7 @@ # # PROVIDE: FILESYSTEMS -# REQUIRE: root mountcritlocal cleanvar zfs +# REQUIRE: root mountcritlocal cleanvar # This is a dummy dependency, for services which require file systems # to be mounted before starting. It also serves as the default early / Modified: projects/building-blocks/etc/rc.d/dumpon ============================================================================== --- projects/building-blocks/etc/rc.d/dumpon Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/dumpon Sun Nov 30 00:21:06 2014 (r275283) @@ -4,7 +4,6 @@ # # PROVIDE: dumpon -# REQUIRE: zvol # BEFORE: disks # KEYWORD: nojail Modified: projects/building-blocks/etc/rc.d/var ============================================================================== --- projects/building-blocks/etc/rc.d/var Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/var Sun Nov 30 00:21:06 2014 (r275283) @@ -28,7 +28,7 @@ # # PROVIDE: var -# REQUIRE: mountcritlocal zfs +# REQUIRE: mountcritlocal # NFS /var is not supported, unless NFS /var is part of diskless NFS / Modified: projects/building-blocks/etc/rc.d/zfs ============================================================================== --- projects/building-blocks/etc/rc.d/zfs Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/zfs Sun Nov 30 00:21:06 2014 (r275283) @@ -5,6 +5,7 @@ # PROVIDE: zfs # REQUIRE: mountcritlocal +# BEFORE: FILESYSTEMS var . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/zvol ============================================================================== --- projects/building-blocks/etc/rc.d/zvol Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/zvol Sun Nov 30 00:21:06 2014 (r275283) @@ -5,6 +5,7 @@ # PROVIDE: zvol # REQUIRE: hostid +# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr