Attachment 184146 Details for Bug 220530 – patch to enable services to run into jailvnet

[patch] patch to enable services to run into jailvnet

freebsd.rc.jailvnet.patch (text/plain), 4.30 KB, created by Olivier Cochard on 2017-07-07 07:45:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Cochard

Created: 2017-07-07 07:45:43 UTC

Size: 4.30 KB

patch

obsolete

>Index: etc/rc.d/defaultroute
>===================================================================
>--- etc/rc.d/defaultroute	(revision 320759)
>+++ etc/rc.d/defaultroute	(working copy)
>@@ -7,7 +7,7 @@
> 
> # PROVIDE: defaultroute
> # REQUIRE: devd netif stf
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> . /etc/network.subr
>Index: etc/rc.d/dhclient
>===================================================================
>--- etc/rc.d/dhclient	(revision 320759)
>+++ etc/rc.d/dhclient	(working copy)
>@@ -4,7 +4,7 @@
> #
> 
> # PROVIDE: dhclient
>-# KEYWORD: nojail nostart
>+# KEYWORD: nojailvnet nostart
> 
> . /etc/rc.subr
> . /etc/network.subr
>Index: etc/rc.d/ip6addrctl
>===================================================================
>--- etc/rc.d/ip6addrctl	(revision 320759)
>+++ etc/rc.d/ip6addrctl	(working copy)
>@@ -6,7 +6,7 @@
> # PROVIDE: ip6addrctl
> # REQUIRE: FILESYSTEMS
> # BEFORE: netif
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> . /etc/network.subr
>Index: etc/rc.d/natd
>===================================================================
>--- etc/rc.d/natd	(revision 320759)
>+++ etc/rc.d/natd	(working copy)
>@@ -4,7 +4,7 @@
> #
> 
> # PROVIDE: natd
>-# KEYWORD: nostart nojail
>+# KEYWORD: nostart nojailvnet
> 
> . /etc/rc.subr
> . /etc/network.subr
>Index: etc/rc.d/pf
>===================================================================
>--- etc/rc.d/pf	(revision 320759)
>+++ etc/rc.d/pf	(working copy)
>@@ -6,7 +6,7 @@
> # PROVIDE: pf
> # REQUIRE: FILESYSTEMS netif pflog pfsync
> # BEFORE:  routing
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/pflog
>===================================================================
>--- etc/rc.d/pflog	(revision 320759)
>+++ etc/rc.d/pflog	(working copy)
>@@ -5,7 +5,7 @@
> 
> # PROVIDE: pflog
> # REQUIRE: FILESYSTEMS netif
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/pfsync
>===================================================================
>--- etc/rc.d/pfsync	(revision 320759)
>+++ etc/rc.d/pfsync	(working copy)
>@@ -5,7 +5,7 @@
> 
> # PROVIDE: pfsync
> # REQUIRE: FILESYSTEMS netif
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>@@ -15,7 +15,7 @@
> 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 @@
> 	if [ -n "${pfsync_syncpeer}" ]; then
> 		_syncpeer="syncpeer ${pfsync_syncpeer}"
> 	fi
>-	load_kld pfsync
> 	ifconfig pfsync0 $_syncpeer syncdev $pfsync_syncdev $pfsync_ifconfig up
> }
> 
>Index: etc/rc.d/rarpd
>===================================================================
>--- etc/rc.d/rarpd	(revision 320759)
>+++ etc/rc.d/rarpd	(working copy)
>@@ -6,7 +6,7 @@
> # PROVIDE: rarpd
> # REQUIRE: DAEMON FILESYSTEMS
> # BEFORE:  LOGIN
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/route6d
>===================================================================
>--- etc/rc.d/route6d	(revision 320759)
>+++ etc/rc.d/route6d	(working copy)
>@@ -5,7 +5,7 @@
> 
> # PROVIDE: route6d
> # REQUIRE: netif routing
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/routed
>===================================================================
>--- etc/rc.d/routed	(revision 320759)
>+++ etc/rc.d/routed	(working copy)
>@@ -6,7 +6,7 @@
> # PROVIDE: routed
> # REQUIRE: netif routing
> # BEFORE: NETWORK
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/rtsold
>===================================================================
>--- etc/rc.d/rtsold	(revision 320759)
>+++ etc/rc.d/rtsold	(working copy)
>@@ -6,7 +6,7 @@
> # PROVIDE: rtsold
> # REQUIRE: netif
> # BEFORE: NETWORKING
>-# KEYWORD: nojail shutdown
>+# KEYWORD: nojailvnet shutdown
> 
> . /etc/rc.subr
> 
>Index: etc/rc.d/static_arp
>===================================================================
>--- etc/rc.d/static_arp	(revision 320759)
>+++ etc/rc.d/static_arp	(working copy)
>@@ -31,7 +31,7 @@
> 
> # PROVIDE: static_arp
> # REQUIRE: netif
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> . /etc/network.subr
>Index: etc/rc.d/static_ndp
>===================================================================
>--- etc/rc.d/static_ndp	(revision 320759)
>+++ etc/rc.d/static_ndp	(working copy)
>@@ -31,7 +31,7 @@
> 
> # PROVIDE: static_ndp
> # REQUIRE: netif
>-# KEYWORD: nojail
>+# KEYWORD: nojailvnet
> 
> . /etc/rc.subr
> . /etc/network.subr

Actions: View | Diff

Attachments on bug 220530: 184146