diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-08-25 21:34:34 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-08-25 21:34:34 +0000 |
| commit | e68d541daeebcaa1231376a5472f24668ffaa6a2 (patch) | |
| tree | 54599a279c58d39d08667e56994e6a556958869a | |
| parent | rc.d scripts are shell scripts and need to be sourced in svc_get_flags(). (diff) | |
| download | wireguard-openbsd-e68d541daeebcaa1231376a5472f24668ffaa6a2.tar.xz wireguard-openbsd-e68d541daeebcaa1231376a5472f24668ffaa6a2.zip | |
get rid of the tempfile in svc_default_enabled_flags();
feedback and ok ajacoutot@
| -rw-r--r-- | usr.sbin/rcctl/rcctl.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh index 880dc7a6be9..2c5abe19bb5 100644 --- a/usr.sbin/rcctl/rcctl.sh +++ b/usr.sbin/rcctl/rcctl.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: rcctl.sh,v 1.25 2014/08/25 21:06:46 ajacoutot Exp $ +# $OpenBSD: rcctl.sh,v 1.26 2014/08/25 21:34:34 schwarze Exp $ # # Copyright (c) 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -74,12 +74,10 @@ svc_default_enabled_flags() { local _svc=$1 [ -n "${_svc}" ] || return - local _tmp=$(mktemp -t rcctl-deflags.XXXXXXXXXX) || exit 1 - echo "pkg_scripts=${_svc}" >${_tmp} - echo "${_svc}_flags=" >>${_tmp} - _rc_parse_conf /etc/rc.conf ${_tmp} - rm ${_tmp} + _rc_parse_conf /etc/rc.conf + pkg_scripts=${_svc} + unset ${_svc}_flags echo $(svc_get_flags ${_svc}) _rc_parse_conf } |