diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-01-15 20:59:57 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-01-15 20:59:57 +0000 |
| commit | 778aaf99e64d2edf840afe7641ee3ee4a4a7bb52 (patch) | |
| tree | c8593a452ae31dc13743ee8d8737af95336d71ad /usr.sbin | |
| parent | 53a08c47dc008c1a26310a622e72b42d0f88f791 (diff) | |
| download | FreeBSD-src-778aaf99e64d2edf840afe7641ee3ee4a4a7bb52.zip FreeBSD-src-778aaf99e64d2edf840afe7641ee3ee4a4a7bb52.tar.gz | |
MFC: r287581
Add an additional check to service(8) -e incase rcvar is blank
Sponsored by: ScaleEngine Inc.
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/service/service.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 6ba2a8e..5c3807d 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -71,7 +71,9 @@ if [ -n "$RESTART" ]; then if grep -q ^rcvar $file; then eval `grep ^name= $file` eval `grep ^rcvar $file` - load_rc_config_var ${name} ${rcvar} + if [ -n "$rcvar" ]; then + load_rc_config_var ${name} ${rcvar} + fi checkyesno $rcvar 2>/dev/null && run_rc_script ${file} stop fi done @@ -101,7 +103,9 @@ if [ -n "$ENABLED" ]; then if grep -q ^rcvar $file; then eval `grep ^name= $file` eval `grep ^rcvar $file` - load_rc_config_var ${name} ${rcvar} + if [ -n "$rcvar" ]; then + load_rc_config_var ${name} ${rcvar} + fi checkyesno $rcvar 2>/dev/null && echo $file fi done |
