From owner-svn-src-user@freebsd.org Sun Oct 25 05:52:54 2015 Return-Path: Delivered-To: svn-src-user@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 9647174D2 for ; Sun, 25 Oct 2015 05:52:54 +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 496BCE76; Sun, 25 Oct 2015 05:52:54 +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 t9P5qrEH020918; Sun, 25 Oct 2015 05:52:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P5qr8f020917; Sun, 25 Oct 2015 05:52:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250552.t9P5qr8f020917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 05:52:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289917 - user/ngie/detangle-rc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 05:52:54 -0000 Author: ngie Date: Sun Oct 25 05:52:53 2015 New Revision: 289917 URL: https://svnweb.freebsd.org/changeset/base/289917 Log: Detangle some of the bits of etc/rc.d that I didn't get to in projects/building-blocks Added: - copied from r289916, head/ Directory Properties: user/ngie/detangle-rc/ (props changed) From owner-svn-src-user@freebsd.org Sun Oct 25 05:56:23 2015 Return-Path: Delivered-To: svn-src-user@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 AE6297561 for ; Sun, 25 Oct 2015 05:56:23 +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 63BDE1FE; Sun, 25 Oct 2015 05:56:23 +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 t9P5uMUB021085; Sun, 25 Oct 2015 05:56:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P5uMaJ021083; Sun, 25 Oct 2015 05:56:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250556.t9P5uMaJ021083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 05:56:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289918 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 05:56:23 -0000 Author: ngie Date: Sun Oct 25 05:56:22 2015 New Revision: 289918 URL: https://svnweb.freebsd.org/changeset/base/289918 Log: Try to fix the regression introduced in r282145 by making ldconfig only depend on FILESYSTEMS, then regen the ldconfig hints in mountcritremote if a remote file system was mounted TODO: test the change with a diskless /var Proposed patch for PR: 202726 Modified: user/ngie/detangle-rc/etc/rc.d/ldconfig user/ngie/detangle-rc/etc/rc.d/mountcritremote Modified: user/ngie/detangle-rc/etc/rc.d/ldconfig ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/ldconfig Sun Oct 25 05:52:53 2015 (r289917) +++ user/ngie/detangle-rc/etc/rc.d/ldconfig Sun Oct 25 05:56:22 2015 (r289918) @@ -4,7 +4,7 @@ # # PROVIDE: ldconfig -# REQUIRE: mountcritremote FILESYSTEMS +# REQUIRE: FILESYSTEMS # BEFORE: DAEMON . /etc/rc.subr Modified: user/ngie/detangle-rc/etc/rc.d/mountcritremote ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/mountcritremote Sun Oct 25 05:52:53 2015 (r289917) +++ user/ngie/detangle-rc/etc/rc.d/mountcritremote Sun Oct 25 05:56:22 2015 (r289918) @@ -34,12 +34,15 @@ mountcritremote_precmd() mountcritremote_start() { + local mounted_remote_filesystem=false + # Mount nfs filesystems. # case "`/sbin/mount -d -a -t nfs`" in '') ;; *) + mounted_remote_filesystem=true echo -n 'Mounting NFS file systems:' mount -a -t nfs echo '.' @@ -63,6 +66,7 @@ mountcritremote_start() case "`mount -d -a -t ${fstype}`" in *mount_${fstype}*) + mounted_remote_filesystem=true echo -n "Mounting ${fsdecr} file systems:" mount -a -t ${fstype} echo '.' @@ -70,9 +74,15 @@ mountcritremote_start() esac done - # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar quietreload - rm -f /var/run/clean_var /var/spool/lock/clean_var + if $mounted_remote_filesystem; then + # Cleanup /var again just in case it's a network mount. + /etc/rc.d/cleanvar quietreload + rm -f /var/run/clean_var /var/spool/lock/clean_var + + # Regenerate the ldconfig hints in case there are additional + # library paths on remote file systems + /etc/rc.d/ldconfig quietstart + fi } load_rc_config $name From owner-svn-src-user@freebsd.org Sun Oct 25 05:59:04 2015 Return-Path: Delivered-To: svn-src-user@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 DF9DF7580 for ; Sun, 25 Oct 2015 05:59:04 +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 A700D336; Sun, 25 Oct 2015 05:59:04 +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 t9P5x3we021214; Sun, 25 Oct 2015 05:59:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P5x3Yd021211; Sun, 25 Oct 2015 05:59:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250559.t9P5x3Yd021211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 05:59:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289919 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 05:59:05 -0000 Author: ngie Date: Sun Oct 25 05:59:03 2015 New Revision: 289919 URL: https://svnweb.freebsd.org/changeset/base/289919 Log: Make hostid_save and netif REQUIRE hostid netif needs hostid to be generate first in the event that bridging is being setup via netif. The reason for hostid_save needing it is fairly straightforward PR: 195188 Modified: user/ngie/detangle-rc/etc/rc.d/hostid_save user/ngie/detangle-rc/etc/rc.d/netif Modified: user/ngie/detangle-rc/etc/rc.d/hostid_save ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/hostid_save Sun Oct 25 05:56:22 2015 (r289918) +++ user/ngie/detangle-rc/etc/rc.d/hostid_save Sun Oct 25 05:59:03 2015 (r289919) @@ -4,7 +4,7 @@ # # PROVIDE: hostid_save -# REQUIRE: root +# REQUIRE: hostid root # KEYWORD: nojail . /etc/rc.subr Modified: user/ngie/detangle-rc/etc/rc.d/netif ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/netif Sun Oct 25 05:56:22 2015 (r289918) +++ user/ngie/detangle-rc/etc/rc.d/netif Sun Oct 25 05:59:03 2015 (r289919) @@ -27,7 +27,7 @@ # PROVIDE: netif # REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl -# REQUIRE: ipfilter ipfs +# REQUIRE: hostid ipfilter ipfs # KEYWORD: nojailvnet . /etc/rc.subr From owner-svn-src-user@freebsd.org Sun Oct 25 06:02:15 2015 Return-Path: Delivered-To: svn-src-user@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 2BB047660 for ; Sun, 25 Oct 2015 06:02:15 +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 E8FAC87F; Sun, 25 Oct 2015 06:02:14 +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 t9P62EXR023798; Sun, 25 Oct 2015 06:02:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P62DNQ023795; Sun, 25 Oct 2015 06:02:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250602.t9P62DNQ023795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 06:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289920 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 06:02:15 -0000 Author: ngie Date: Sun Oct 25 06:02:13 2015 New Revision: 289920 URL: https://svnweb.freebsd.org/changeset/base/289920 Log: Remove zfs dependency in var and FILESYSTEMS Modified: user/ngie/detangle-rc/etc/rc.d/FILESYSTEMS user/ngie/detangle-rc/etc/rc.d/var user/ngie/detangle-rc/etc/rc.d/zfs Modified: user/ngie/detangle-rc/etc/rc.d/FILESYSTEMS ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/FILESYSTEMS Sun Oct 25 05:59:03 2015 (r289919) +++ user/ngie/detangle-rc/etc/rc.d/FILESYSTEMS Sun Oct 25 06:02:13 2015 (r289920) @@ -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: user/ngie/detangle-rc/etc/rc.d/var ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/var Sun Oct 25 05:59:03 2015 (r289919) +++ user/ngie/detangle-rc/etc/rc.d/var Sun Oct 25 06:02:13 2015 (r289920) @@ -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: user/ngie/detangle-rc/etc/rc.d/zfs ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/zfs Sun Oct 25 05:59:03 2015 (r289919) +++ user/ngie/detangle-rc/etc/rc.d/zfs Sun Oct 25 06:02:13 2015 (r289920) @@ -5,6 +5,7 @@ # PROVIDE: zfs # REQUIRE: mountcritlocal +# BEFORE: FILESYSTEMS var . /etc/rc.subr From owner-svn-src-user@freebsd.org Sun Oct 25 06:04:09 2015 Return-Path: Delivered-To: svn-src-user@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 BD1D1768C for ; Sun, 25 Oct 2015 06:04:09 +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 8CB3F9DA; Sun, 25 Oct 2015 06:04:09 +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 t9P648h6023901; Sun, 25 Oct 2015 06:04:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P6489c023899; Sun, 25 Oct 2015 06:04:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250604.t9P6489c023899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 06:04:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289921 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 06:04:09 -0000 Author: ngie Date: Sun Oct 25 06:04:08 2015 New Revision: 289921 URL: https://svnweb.freebsd.org/changeset/base/289921 Log: Remove zvol dependency from dumpon Modified: user/ngie/detangle-rc/etc/rc.d/dumpon user/ngie/detangle-rc/etc/rc.d/zvol Modified: user/ngie/detangle-rc/etc/rc.d/dumpon ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/dumpon Sun Oct 25 06:02:13 2015 (r289920) +++ user/ngie/detangle-rc/etc/rc.d/dumpon Sun Oct 25 06:04:08 2015 (r289921) @@ -4,7 +4,6 @@ # # PROVIDE: dumpon -# REQUIRE: zvol # BEFORE: disks # KEYWORD: nojail Modified: user/ngie/detangle-rc/etc/rc.d/zvol ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/zvol Sun Oct 25 06:02:13 2015 (r289920) +++ user/ngie/detangle-rc/etc/rc.d/zvol Sun Oct 25 06:04:08 2015 (r289921) @@ -5,6 +5,7 @@ # PROVIDE: zvol # REQUIRE: hostid +# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-user@freebsd.org Sun Oct 25 06:06:24 2015 Return-Path: Delivered-To: svn-src-user@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 C5F8476AB for ; Sun, 25 Oct 2015 06:06:24 +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 88B4EAD6; Sun, 25 Oct 2015 06:06:24 +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 t9P66NlX024018; Sun, 25 Oct 2015 06:06:23 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P66Nbh024015; Sun, 25 Oct 2015 06:06:23 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250606.t9P66Nbh024015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 06:06:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289922 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 06:06:24 -0000 Author: ngie Date: Sun Oct 25 06:06:23 2015 New Revision: 289922 URL: https://svnweb.freebsd.org/changeset/base/289922 Log: Remove *route*d dependency from NETWORKING Modified: user/ngie/detangle-rc/etc/rc.d/NETWORKING user/ngie/detangle-rc/etc/rc.d/route6d user/ngie/detangle-rc/etc/rc.d/routed Modified: user/ngie/detangle-rc/etc/rc.d/NETWORKING ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/NETWORKING Sun Oct 25 06:04:08 2015 (r289921) +++ user/ngie/detangle-rc/etc/rc.d/NETWORKING Sun Oct 25 06:06:23 2015 (r289922) @@ -5,7 +5,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed route6d mroute6d resolv bridge +# REQUIRE: defaultroute resolv bridge # REQUIRE: static_arp static_ndp # This is a dummy dependency, for services which require networking Modified: user/ngie/detangle-rc/etc/rc.d/route6d ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/route6d Sun Oct 25 06:04:08 2015 (r289921) +++ user/ngie/detangle-rc/etc/rc.d/route6d Sun Oct 25 06:06:23 2015 (r289922) @@ -5,6 +5,7 @@ # PROVIDE: route6d # REQUIRE: netif routing +# BEFORE: NETWORK # KEYWORD: nojail . /etc/rc.subr Modified: user/ngie/detangle-rc/etc/rc.d/routed ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/routed Sun Oct 25 06:04:08 2015 (r289921) +++ user/ngie/detangle-rc/etc/rc.d/routed Sun Oct 25 06:06:23 2015 (r289922) @@ -5,6 +5,7 @@ # PROVIDE: routed # REQUIRE: netif routing +# BEFORE: NETWORK # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-user@freebsd.org Sun Oct 25 06:07:48 2015 Return-Path: Delivered-To: svn-src-user@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 5E4C976D6 for ; Sun, 25 Oct 2015 06:07: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 27B6EBE2; Sun, 25 Oct 2015 06:07: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 t9P67lHJ024103; Sun, 25 Oct 2015 06:07:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P67lvs024102; Sun, 25 Oct 2015 06:07:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250607.t9P67lvs024102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 06:07:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289923 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 06:07:48 -0000 Author: ngie Date: Sun Oct 25 06:07:46 2015 New Revision: 289923 URL: https://svnweb.freebsd.org/changeset/base/289923 Log: Conditionally install rc.d scripts based on MK_INET6, MK_ROUTED, and MK_ZFS Modified: user/ngie/detangle-rc/etc/rc.d/Makefile Modified: user/ngie/detangle-rc/etc/rc.d/Makefile ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 06:06:23 2015 (r289922) +++ user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 06:07:46 2015 (r289923) @@ -70,7 +70,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - mroute6d \ msgs \ natd \ netif \ @@ -99,7 +98,6 @@ FILES= DAEMON \ resolv \ rfcomm_pppd_server \ root \ - route6d \ routing \ rpcbind \ rtadvd \ @@ -131,8 +129,6 @@ FILES= DAEMON \ ypset \ ypupdated \ ypxfrd \ - zfs \ - zvol .if ${MK_ACCT} != "no" FILES+= accounting @@ -192,6 +188,11 @@ FILES+= ftpd FILES+= hastd .endif +.if ${MK_INET6} != "no" +FILES+= mroute6d +FILES+= route6d +.endif + .if ${MK_INETD} != "no" FILES+= inetd .endif @@ -284,6 +285,11 @@ FILES+= hostapd FILES+= wpa_supplicant .endif +.if ${MK_ZFS} != "no" +FILES+= zfs +FILES+= zvol +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} From owner-svn-src-user@freebsd.org Sun Oct 25 08:30:45 2015 Return-Path: Delivered-To: svn-src-user@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 699BF8D5A for ; Sun, 25 Oct 2015 08:30:45 +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 2E3C21CE1; Sun, 25 Oct 2015 08:30:45 +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 t9P8Uinn069740; Sun, 25 Oct 2015 08:30:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P8UiOg069739; Sun, 25 Oct 2015 08:30:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250830.t9P8UiOg069739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 08:30:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289926 - user/ngie/detangle-rc/tools/build/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 08:30:45 -0000 Author: ngie Date: Sun Oct 25 08:30:44 2015 New Revision: 289926 URL: https://svnweb.freebsd.org/changeset/base/289926 Log: Remove rc.d scripts conditionally after adding the conditional install logic in r289923 Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 07:42:56 2015 (r289925) +++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 08:30:44 2015 (r289926) @@ -999,6 +999,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 @@ -2782,6 +2784,8 @@ OLD_FILES+=usr/share/man/man3/iconvlist. .endif .if ${MK_INET6} == no +OLD_FILES+=etc/rc.d/mroute6d +OLD_FILES+=etc/rc.d/route6d OLD_FILES+=sbin/ping6 OLD_FILES+=sbin/rtsol OLD_FILES+=usr/sbin/ip6addrctl From owner-svn-src-user@freebsd.org Sun Oct 25 08:40:27 2015 Return-Path: Delivered-To: svn-src-user@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 E3C60816A for ; Sun, 25 Oct 2015 08:40:27 +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 A3FD6137F; Sun, 25 Oct 2015 08:40:27 +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 t9P8eQ4o071417; Sun, 25 Oct 2015 08:40:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P8eQsT071415; Sun, 25 Oct 2015 08:40:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250840.t9P8eQsT071415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 08:40:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289927 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 08:40:28 -0000 Author: ngie Date: Sun Oct 25 08:40:26 2015 New Revision: 289927 URL: https://svnweb.freebsd.org/changeset/base/289927 Log: Install etc/rc.d/{rtadvd,rtsold} if MK_INET6 != no and uninstall them if MK_INET6 == no Modified: user/ngie/detangle-rc/etc/rc.d/Makefile user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Modified: user/ngie/detangle-rc/etc/rc.d/Makefile ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 08:30:44 2015 (r289926) +++ user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 08:40:26 2015 (r289927) @@ -100,8 +100,6 @@ FILES= DAEMON \ root \ routing \ rpcbind \ - rtadvd \ - rtsold \ savecore \ sdpd \ securelevel \ @@ -191,6 +189,8 @@ FILES+= hastd .if ${MK_INET6} != "no" FILES+= mroute6d FILES+= route6d +FILES+= rtadvd +FILES+= rtsold .endif .if ${MK_INETD} != "no" Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 08:30:44 2015 (r289926) +++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 08:40:26 2015 (r289927) @@ -2786,6 +2786,8 @@ OLD_FILES+=usr/share/man/man3/iconvlist. .if ${MK_INET6} == no OLD_FILES+=etc/rc.d/mroute6d OLD_FILES+=etc/rc.d/route6d +OLD_FILES+=etc/rc.d/rtadvd +OLD_FILES+=etc/rc.d/rtsold OLD_FILES+=sbin/ping6 OLD_FILES+=sbin/rtsol OLD_FILES+=usr/sbin/ip6addrctl From owner-svn-src-user@freebsd.org Sun Oct 25 08:52:33 2015 Return-Path: Delivered-To: svn-src-user@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 D234A8496 for ; Sun, 25 Oct 2015 08:52:33 +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 9CDA51AA4; Sun, 25 Oct 2015 08:52:33 +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 t9P8qW8U078087; Sun, 25 Oct 2015 08:52:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P8qWP4078085; Sun, 25 Oct 2015 08:52:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250852.t9P8qWP4078085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 08:52:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289928 - in user/ngie/detangle-rc: etc/rc.d tools/build/mk X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 08:52:33 -0000 Author: ngie Date: Sun Oct 25 08:52:32 2015 New Revision: 289928 URL: https://svnweb.freebsd.org/changeset/base/289928 Log: Conditionally install/uninstall ip6addrctl depending on MK_INET6 Modified: user/ngie/detangle-rc/etc/rc.d/Makefile user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Modified: user/ngie/detangle-rc/etc/rc.d/Makefile ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 08:40:26 2015 (r289927) +++ user/ngie/detangle-rc/etc/rc.d/Makefile Sun Oct 25 08:52:32 2015 (r289928) @@ -45,7 +45,6 @@ FILES= DAEMON \ hostid_save \ hostname \ iovctl \ - ip6addrctl \ ipfilter \ ipfs \ ipfw \ @@ -187,6 +186,7 @@ FILES+= hastd .endif .if ${MK_INET6} != "no" +FILES+= ip6addrctl FILES+= mroute6d FILES+= route6d FILES+= rtadvd Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 08:40:26 2015 (r289927) +++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc Sun Oct 25 08:52:32 2015 (r289928) @@ -2784,6 +2784,7 @@ OLD_FILES+=usr/share/man/man3/iconvlist. .endif .if ${MK_INET6} == no +OLD_FILES+=etc/rc.d/ip6addrctl OLD_FILES+=etc/rc.d/mroute6d OLD_FILES+=etc/rc.d/route6d OLD_FILES+=etc/rc.d/rtadvd From owner-svn-src-user@freebsd.org Sun Oct 25 09:16:22 2015 Return-Path: Delivered-To: svn-src-user@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 0F7718B08 for ; Sun, 25 Oct 2015 09:16:22 +0000 (UTC) (envelope-from pho@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 DCB411204; Sun, 25 Oct 2015 09:16:21 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9P9GK5e085260; Sun, 25 Oct 2015 09:16:20 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P9GKgB085259; Sun, 25 Oct 2015 09:16:20 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201510250916.t9P9GKgB085259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 25 Oct 2015 09:16:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289929 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 09:16:22 -0000 Author: pho Date: Sun Oct 25 09:16:20 2015 New Revision: 289929 URL: https://svnweb.freebsd.org/changeset/base/289929 Log: Added a scenario for triggering EDEADLK in vm_pageout_clean(). Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/pageout.sh (contents, props changed) Added: user/pho/stress2/misc/pageout.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/pageout.sh Sun Oct 25 09:16:20 2015 (r289929) @@ -0,0 +1,142 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Trigger the two EDEADLK in vm/vm_pageout.c +# OOVM deadlock seen +# https://people.freebsd.org/~pho/stress/log/pageout.txt + +. ../default.cfg + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/pageout.c +mycc -o pageout -Wall -Wextra -g pageout.c || exit 1 +rm -f pageout.c +cd $odir + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto + +newfs -U md${mdstart}$part > /dev/null + +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint + +f1=$mntpoint/f1 +dd if=/dev/zero of=$f1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" + +daemon sh -c "(cd ../testcases/swap; ./swap -t 5m -i 20 -l 100 -h)" > /dev/null +(cd /tmp; /tmp/pageout $f1) & +sleep .2 +while kill -0 $! 2> /dev/null; do + mksnap_ffs $mntpoint $mntpoint/.snap/stress2 && + rm -f $mntpoint/.snap/stress2 +done +while pgrep -q swap; do + pkill swap +done +wait + +while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +mdconfig -d -u $mdstart +rm -f /tmp/pageout /tmp/pageout.core +exit + +EOF +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +const char *file; + +#define RUNTIME 600 + +void +test(void) +{ + struct stat st; + size_t i, len; + time_t start; + int error, fd, ps; + char *p; + + ps = getpagesize(); + if ((fd = open(file, O_RDWR)) == -1) + err(1, "open(%s)", file); + if ((error = fstat(fd, &st)) == -1) + err(1, "stat(%s)", file); + len = round_page(st.st_size); + do { + if ((p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, + fd, 0)) == MAP_FAILED) { + if (errno == ENOMEM) + len -= ps; + else + err(1, "mmap"); + } + } while (p == MAP_FAILED); + + start = time(NULL); + /* Touch all pages of the file. */ + for (i = 0; i < len; i += ps) + p[i] = 1; + while (time(NULL) - start < RUNTIME) + p[arc4random() % len] = 1; + + if (munmap(p, len) == -1) + err(1, "unmap()"); + close(fd); +} + +int +main(int argc, char *argv[]) +{ + if (argc != 2) + errx(1, "Usage: %s ", argv[0]); + file = argv[1]; + + test(); + + return (0); +} From owner-svn-src-user@freebsd.org Mon Oct 26 15:50:41 2015 Return-Path: Delivered-To: svn-src-user@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 0CB838375 for ; Mon, 26 Oct 2015 15:50:41 +0000 (UTC) (envelope-from glebius@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 C90DD1326; Mon, 26 Oct 2015 15:50:40 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9QFodOX017627; Mon, 26 Oct 2015 15:50:39 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9QFodfp017626; Mon, 26 Oct 2015 15:50:39 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201510261550.t9QFodfp017626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 26 Oct 2015 15:50:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r290013 - user/cperciva/freebsd-update-build/scripts X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2015 15:50:41 -0000 Author: glebius Date: Mon Oct 26 15:50:39 2015 New Revision: 290013 URL: https://svnweb.freebsd.org/changeset/base/290013 Log: New code for applypatches(). - Understands diffs generated by diff(1), not only subversion. - Removes empty files after patching. - With a patch queue doesn't batch patching and removing, instead iterates over queue, and does removals after each patch. Slower, but less prone to errors. Sponsored by: Nginx, Inc. Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Mon Oct 26 15:43:08 2015 (r290012) +++ user/cperciva/freebsd-update-build/scripts/build.subr Mon Oct 26 15:50:39 2015 (r290013) @@ -397,20 +397,19 @@ extractworld () { # Apply a list of patches stored in $2 to a world in ${WORKDIR}/$1 applypatches () { + cd ${WORKDIR}/$1/usr/src while read PATCH; do - cat ${PATCHDIR}/${PATCH} | - ( cd ${WORKDIR}/$1/usr/src && patch -p0 ) + patch -p0 < ${PATCHDIR}/${PATCH} + # Remove ".orig" files created by patch(1) and empty files + for file in $(awk '$1 ~ /^(Index:|diff)/ { print $NF }' < \ + ${PATCHDIR}/${PATCH}); do + echo ${file}.orig + if [ ! -s ${file} ]; then + echo ${file} + fi + done | xargs rm -f done < $2 2> ${WORKDIR}/$1-patch.log - - # Remove ".orig" files created by patch(1) - cat $2 | - lam -s "${PATCHDIR}/" - | - xargs cat | - grep -E '^Index: ' | - cut -f 2 -d ' ' | - lam - -s '.orig' | - sort -u | - ( cd ${WORKDIR}/$1/usr/src && xargs rm ) + cd - } # In a world at ${WORKDIR}/$1, edit src/sys/conf/newvers.sh to