diff options
author | Kristof Provost <kp@FreeBSD.org> | 2017-07-08 09:28:31 +0000 |
---|---|---|
committer | Kristof Provost <kp@FreeBSD.org> | 2017-07-08 09:28:31 +0000 |
commit | 2ca5f390c4431a77ff9a3f735d7e12a3312d4c97 (patch) | |
tree | 5a7080a62368f1034c10f712b6aa9019f97faaa0 /etc/rc.d | |
parent | dd5ef26e97362b4ccbfb53c5fde31aa82561a5e1 (diff) | |
download | src-2ca5f390c4431a77ff9a3f735d7e12a3312d4c97.tar.gz src-2ca5f390c4431a77ff9a3f735d7e12a3312d4c97.zip |
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
Notes
Notes:
svn path=/head/; revision=320802
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-x | etc/rc.d/defaultroute | 2 | ||||
-rwxr-xr-x | etc/rc.d/dhclient | 2 | ||||
-rwxr-xr-x | etc/rc.d/ip6addrctl | 2 | ||||
-rwxr-xr-x | etc/rc.d/natd | 2 | ||||
-rwxr-xr-x | etc/rc.d/pf | 2 | ||||
-rwxr-xr-x | etc/rc.d/pflog | 2 | ||||
-rwxr-xr-x | etc/rc.d/pfsync | 5 | ||||
-rwxr-xr-x | etc/rc.d/rarpd | 2 | ||||
-rwxr-xr-x | etc/rc.d/route6d | 2 | ||||
-rwxr-xr-x | etc/rc.d/routed | 2 | ||||
-rwxr-xr-x | etc/rc.d/rtsold | 2 | ||||
-rwxr-xr-x | etc/rc.d/static_arp | 2 | ||||
-rwxr-xr-x | etc/rc.d/static_ndp | 2 |
13 files changed, 14 insertions, 15 deletions
diff --git a/etc/rc.d/defaultroute b/etc/rc.d/defaultroute index cc10a01a9a35..a4c9647766a8 100755 --- a/etc/rc.d/defaultroute +++ b/etc/rc.d/defaultroute @@ -7,7 +7,7 @@ # PROVIDE: defaultroute # REQUIRE: devd netif stf -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index f2d17c5c04b2..eb9860ea4cc0 100755 --- a/etc/rc.d/dhclient +++ b/etc/rc.d/dhclient @@ -4,7 +4,7 @@ # # PROVIDE: dhclient -# KEYWORD: nojail nostart +# KEYWORD: nojailvnet nostart . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index 8752f09eb38b..3260b1cab9a5 100755 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -6,7 +6,7 @@ # PROVIDE: ip6addrctl # REQUIRE: FILESYSTEMS # BEFORE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/natd b/etc/rc.d/natd index 1a16d981a17b..635113581805 100755 --- a/etc/rc.d/natd +++ b/etc/rc.d/natd @@ -4,7 +4,7 @@ # # PROVIDE: natd -# KEYWORD: nostart nojail +# KEYWORD: nostart nojailvnet . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/pf b/etc/rc.d/pf index 4f8cbfc123ea..cab7d8ee9eae 100755 --- a/etc/rc.d/pf +++ b/etc/rc.d/pf @@ -6,7 +6,7 @@ # PROVIDE: pf # REQUIRE: FILESYSTEMS netif pflog pfsync # BEFORE: routing -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog index fc80975afcfa..d0fb4e6cbf08 100755 --- a/etc/rc.d/pflog +++ b/etc/rc.d/pflog @@ -5,7 +5,7 @@ # PROVIDE: pflog # REQUIRE: FILESYSTEMS netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr diff --git a/etc/rc.d/pfsync b/etc/rc.d/pfsync index cc8e85f073e3..77369aa59961 100755 --- a/etc/rc.d/pfsync +++ b/etc/rc.d/pfsync @@ -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 } diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd index 433139a6f82a..ef87bcba8f83 100755 --- a/etc/rc.d/rarpd +++ b/etc/rc.d/rarpd @@ -6,7 +6,7 @@ # PROVIDE: rarpd # REQUIRE: DAEMON FILESYSTEMS # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d index ca8d2938fcc7..f17f7b4090c0 100755 --- a/etc/rc.d/route6d +++ b/etc/rc.d/route6d @@ -5,7 +5,7 @@ # PROVIDE: route6d # REQUIRE: netif routing -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr diff --git a/etc/rc.d/routed b/etc/rc.d/routed index fe150bf0b442..f8890537b22c 100755 --- a/etc/rc.d/routed +++ b/etc/rc.d/routed @@ -6,7 +6,7 @@ # PROVIDE: routed # REQUIRE: netif routing # BEFORE: NETWORK -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr diff --git a/etc/rc.d/rtsold b/etc/rc.d/rtsold index 145c624f61b0..0bc7d9287adf 100755 --- a/etc/rc.d/rtsold +++ b/etc/rc.d/rtsold @@ -6,7 +6,7 @@ # PROVIDE: rtsold # REQUIRE: netif # BEFORE: NETWORKING -# KEYWORD: nojail shutdown +# KEYWORD: nojailvnet shutdown . /etc/rc.subr diff --git a/etc/rc.d/static_arp b/etc/rc.d/static_arp index 7242dcf8fed0..f874a5bc4306 100755 --- a/etc/rc.d/static_arp +++ b/etc/rc.d/static_arp @@ -31,7 +31,7 @@ # PROVIDE: static_arp # REQUIRE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/static_ndp b/etc/rc.d/static_ndp index 314adbf7c565..bf44b65af088 100755 --- a/etc/rc.d/static_ndp +++ b/etc/rc.d/static_ndp @@ -31,7 +31,7 @@ # PROVIDE: static_ndp # REQUIRE: netif -# KEYWORD: nojail +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr |