From owner-svn-src-head@freebsd.org Sat Jul 8 09:28:34 2017 Return-Path: Delivered-To: svn-src-head@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 0E24AD9567B; Sat, 8 Jul 2017 09:28:34 +0000 (UTC) (envelope-from kp@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 D37C37A579; Sat, 8 Jul 2017 09:28:33 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v689SXSd013520; Sat, 8 Jul 2017 09:28:33 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v689SV93013507; Sat, 8 Jul 2017 09:28:31 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201707080928.v689SV93013507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Sat, 8 Jul 2017 09:28:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320802 - head/etc/rc.d X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/etc/rc.d X-SVN-Commit-Revision: 320802 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2017 09:28:34 -0000 Author: kp Date: Sat Jul 8 09:28:31 2017 New Revision: 320802 URL: https://svnweb.freebsd.org/changeset/base/320802 Log: Allow more services to run in vnet jails After some tests, here are the services that run into a vnet jail: - defaultroute - dhclient - ip6addrctl - natd - pf - pfsync - pflog (deamon runs, pflog0 interface usable, but /var/log/pflog not filled) - rarpd - route6d (do nothing anyway because obsolete) - routed (do nothing anyway because obsolete) - rtsold - static_arp - static_ndp PR: 220530 Submitted by: olivier@freebsd.org Modified: head/etc/rc.d/defaultroute head/etc/rc.d/dhclient head/etc/rc.d/ip6addrctl head/etc/rc.d/natd head/etc/rc.d/pf head/etc/rc.d/pflog head/etc/rc.d/pfsync head/etc/rc.d/rarpd head/etc/rc.d/route6d head/etc/rc.d/routed head/etc/rc.d/rtsold head/etc/rc.d/static_arp head/etc/rc.d/static_ndp Modified: head/etc/rc.d/defaultroute ============================================================================== --- head/etc/rc.d/defaultroute Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/defaultroute Sat Jul 8 09:28:31 2017 (r320802) @@ -7,7 +7,7 @@ # PROVIDE: defaultroute # REQUIRE: devd netif stf -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr Modified: head/etc/rc.d/dhclient ============================================================================== --- head/etc/rc.d/dhclient Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/dhclient Sat Jul 8 09:28:31 2017 (r320802) @@ -4,7 +4,7 @@ # # PROVIDE: dhclient -# KEYWORD: nojail nostart +# KEYWORD: nojailvnet nostart . /etc/rc.subr . /etc/network.subr Modified: head/etc/rc.d/ip6addrctl ============================================================================== --- head/etc/rc.d/ip6addrctl Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/ip6addrctl Sat Jul 8 09:28:31 2017 (r320802) @@ -6,7 +6,7 @@ # PROVIDE: ip6addrctl # REQUIRE: FILESYSTEMS # BEFORE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr Modified: head/etc/rc.d/natd ============================================================================== --- head/etc/rc.d/natd Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/natd Sat Jul 8 09:28:31 2017 (r320802) @@ -4,7 +4,7 @@ # # PROVIDE: natd -# KEYWORD: nostart nojail +# KEYWORD: nostart nojailvnet . /etc/rc.subr . /etc/network.subr Modified: head/etc/rc.d/pf ============================================================================== --- head/etc/rc.d/pf Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/pf Sat Jul 8 09:28:31 2017 (r320802) @@ -6,7 +6,7 @@ # PROVIDE: pf # REQUIRE: FILESYSTEMS netif pflog pfsync # BEFORE: routing -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr Modified: head/etc/rc.d/pflog ============================================================================== --- head/etc/rc.d/pflog Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/pflog Sat Jul 8 09:28:31 2017 (r320802) @@ -5,7 +5,7 @@ # PROVIDE: pflog # REQUIRE: FILESYSTEMS netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr Modified: head/etc/rc.d/pfsync ============================================================================== --- head/etc/rc.d/pfsync Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/pfsync Sat Jul 8 09:28:31 2017 (r320802) @@ -5,7 +5,7 @@ # PROVIDE: pfsync # REQUIRE: FILESYSTEMS netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr @@ -15,7 +15,7 @@ rcvar="pfsync_enable" start_precmd="pfsync_prestart" start_cmd="pfsync_start" stop_cmd="pfsync_stop" -required_modules="pf" +required_modules="pf pfsync" pfsync_prestart() { @@ -36,7 +36,6 @@ pfsync_start() if [ -n "${pfsync_syncpeer}" ]; then _syncpeer="syncpeer ${pfsync_syncpeer}" fi - load_kld pfsync ifconfig pfsync0 $_syncpeer syncdev $pfsync_syncdev $pfsync_ifconfig up } Modified: head/etc/rc.d/rarpd ============================================================================== --- head/etc/rc.d/rarpd Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/rarpd Sat Jul 8 09:28:31 2017 (r320802) @@ -6,7 +6,7 @@ # PROVIDE: rarpd # REQUIRE: DAEMON FILESYSTEMS # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr Modified: head/etc/rc.d/route6d ============================================================================== --- head/etc/rc.d/route6d Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/route6d Sat Jul 8 09:28:31 2017 (r320802) @@ -5,7 +5,7 @@ # PROVIDE: route6d # REQUIRE: netif routing -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr Modified: head/etc/rc.d/routed ============================================================================== --- head/etc/rc.d/routed Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/routed Sat Jul 8 09:28:31 2017 (r320802) @@ -6,7 +6,7 @@ # PROVIDE: routed # REQUIRE: netif routing # BEFORE: NETWORK -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr Modified: head/etc/rc.d/rtsold ============================================================================== --- head/etc/rc.d/rtsold Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/rtsold Sat Jul 8 09:28:31 2017 (r320802) @@ -6,7 +6,7 @@ # PROVIDE: rtsold # REQUIRE: netif # BEFORE: NETWORKING -# KEYWORD: nojail shutdown +# KEYWORD: nojailvnet shutdown . /etc/rc.subr Modified: head/etc/rc.d/static_arp ============================================================================== --- head/etc/rc.d/static_arp Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/static_arp Sat Jul 8 09:28:31 2017 (r320802) @@ -31,7 +31,7 @@ # PROVIDE: static_arp # REQUIRE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr Modified: head/etc/rc.d/static_ndp ============================================================================== --- head/etc/rc.d/static_ndp Sat Jul 8 07:33:30 2017 (r320801) +++ head/etc/rc.d/static_ndp Sat Jul 8 09:28:31 2017 (r320802) @@ -31,7 +31,7 @@ # PROVIDE: static_ndp # REQUIRE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr