diff options
| author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2021-03-01 22:18:58 +0000 |
|---|---|---|
| committer | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2021-03-01 22:18:58 +0000 |
| commit | 05b267e23257a5c89ab2d55888a781bf6f90ec4e (patch) | |
| tree | b3ad6aad286f4ddf4d9235f1d42efe35816fe430 /usr.sbin | |
| parent | 94f2e42f5e0b78a7a4684d4a4eb62ea470a57eb1 (diff) | |
| download | src-05b267e23257a5c89ab2d55888a781bf6f90ec4e.tar.gz src-05b267e23257a5c89ab2d55888a781bf6f90ec4e.zip | |
service: respect nojailvnet keyword
In the 761d2bb5b9e70cf30f9c2dac62a47a2d2593e83f we added nojailvnet
keyword. The nojailvnet keyword is used to skip startup scripts in
jails that are run without VNET.
The service.sh was omitted in this commit. The service.sh
even documents that this is the same code as in rc - so lets reflect
that.
Submitted by: Adam Wołk <a.wolk@fudosecurity.com>
Sponsored by: Fudo Security
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/service/service.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 42a50fcf61b9..9646aae67b0c 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -83,6 +83,9 @@ if [ -n "$RESTART" ]; then skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" + if [ `/sbin/sysctl -n security.jail.vnet` -ne 1 ]; then + skip="$skip -s nojailvnet" + fi fi [ -n "$local_startup" ] && find_local_scripts_new files=`rcorder ${skip} ${local_rc} 2>/dev/null` @@ -113,6 +116,9 @@ if [ -n "$ENABLED" -o -n "$RCORDER" ]; then skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" + if [ `/sbin/sysctl -n security.jail.vnet` -ne 1 ]; then + skip="$skip -s nojailvnet" + fi fi [ -n "$local_startup" ] && find_local_scripts_new files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null` |