From owner-svn-src-stable@freebsd.org Wed Jun 8 13:32:02 2016 Return-Path: Delivered-To: svn-src-stable@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 D9E63B6F838; Wed, 8 Jun 2016 13:32:02 +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 3A4A31AC5; Wed, 8 Jun 2016 13:32:02 +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 u58DW1nR039937; Wed, 8 Jun 2016 13:32:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58DW0C3039930; Wed, 8 Jun 2016 13:32:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201606081332.u58DW0C3039930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 8 Jun 2016 13:32:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301612 - in stable/10: etc/rc.d tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2016 13:32:03 -0000 Author: ngie Date: Wed Jun 8 13:32:00 2016 New Revision: 301612 URL: https://svnweb.freebsd.org/changeset/base/301612 Log: MFC r299839,r299840,r299841: r299839: Make FILESYSTEMS, dumpon, and var not depend on zfs and zvol Make zfs and zvol come before all of the items that depended on them previously r299840: Conditionalize etc/rc.d/{zfs,zvol} install on MK_ZFS != no r299841: Remove etc/rc.d/{zfs,zvol} if MK_ZFS != no Modified: stable/10/etc/rc.d/FILESYSTEMS stable/10/etc/rc.d/Makefile stable/10/etc/rc.d/dumpon stable/10/etc/rc.d/var stable/10/etc/rc.d/zfs stable/10/etc/rc.d/zvol stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/rc.d/FILESYSTEMS ============================================================================== --- stable/10/etc/rc.d/FILESYSTEMS Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/FILESYSTEMS Wed Jun 8 13:32:00 2016 (r301612) @@ -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: stable/10/etc/rc.d/Makefile ============================================================================== --- stable/10/etc/rc.d/Makefile Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/Makefile Wed Jun 8 13:32:00 2016 (r301612) @@ -134,8 +134,6 @@ FILES= DAEMON \ ypset \ ypupdated \ ypxfrd \ - zfs \ - zvol .if ${MK_ACCT} != "no" FILES+= accounting @@ -283,6 +281,11 @@ FILES+= hostapd FILES+= wpa_supplicant .endif +.if ${MK_ZFS} != "no" +FILES+= zfs +FILES+= zvol +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} Modified: stable/10/etc/rc.d/dumpon ============================================================================== --- stable/10/etc/rc.d/dumpon Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/dumpon Wed Jun 8 13:32:00 2016 (r301612) @@ -4,7 +4,6 @@ # # PROVIDE: dumpon -# REQUIRE: zvol # BEFORE: disks # KEYWORD: nojail Modified: stable/10/etc/rc.d/var ============================================================================== --- stable/10/etc/rc.d/var Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/var Wed Jun 8 13:32:00 2016 (r301612) @@ -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: stable/10/etc/rc.d/zfs ============================================================================== --- stable/10/etc/rc.d/zfs Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/zfs Wed Jun 8 13:32:00 2016 (r301612) @@ -5,6 +5,7 @@ # PROVIDE: zfs # REQUIRE: mountcritlocal +# BEFORE: FILESYSTEMS var . /etc/rc.subr Modified: stable/10/etc/rc.d/zvol ============================================================================== --- stable/10/etc/rc.d/zvol Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/etc/rc.d/zvol Wed Jun 8 13:32:00 2016 (r301612) @@ -5,6 +5,7 @@ # PROVIDE: zvol # REQUIRE: hostid +# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 13:25:15 2016 (r301611) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 13:32:00 2016 (r301612) @@ -650,6 +650,8 @@ OLD_DIRS+=usr/share/dtrace OLD_FILES+=boot/gptzfsboot OLD_FILES+=boot/zfsboot OLD_FILES+=boot/zfsloader +OLD_FILES+=etc/rc.d/zfs +OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs