diff options
| author | schmonz <schmonz> | 2017-04-27 20:21:51 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2017-04-27 20:21:51 +0000 |
| commit | a554f6f20b2f72e1bf204c54084adbf01ca6de50 (patch) | |
| tree | f3679b72856ce302c1ba1f1d33a4491927f0afc2 /security | |
| parent | 4a07c5052ada6c0b3a0f0e12f16bb425d526a702 (diff) | |
| download | pkgsrc-a554f6f20b2f72e1bf204c54084adbf01ca6de50.tar.gz | |
Wrap long command line. Replace LOCALBASE with PREFIX.
Diffstat (limited to 'security')
| -rw-r--r-- | security/cvm/files/cvm.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/security/cvm/files/cvm.sh b/security/cvm/files/cvm.sh index 6c35ed30b92..fedd72fc974 100644 --- a/security/cvm/files/cvm.sh +++ b/security/cvm/files/cvm.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: cvm.sh,v 1.1.1.1 2005/07/20 03:28:42 schmonz Exp $ +# $NetBSD: cvm.sh,v 1.2 2017/04/27 20:21:51 schmonz Exp $ # # PROVIDE: cvm @@ -15,23 +15,27 @@ name="cvm" : ${cvm_protocol:="local"} : ${cvm_log:="YES"} : ${cvm_logcmd:="logger -t nb${name} -p auth.info"} -: ${cvm_nologcmd:="@LOCALBASE@/bin/multilog -*"} +: ${cvm_nologcmd:="@PREFIX@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi rcvar=${name} -command="@LOCALBASE@/bin/cvm-${cvm_module}" +command="@PREFIX@/bin/cvm-${cvm_module}" start_precmd="cvm_precmd" cvm_precmd() { - if [ -f /etc/rc.subr ]; then - checkyesno cvm_log || cvm_logcmd=${cvm_nologcmd} + if [ -f /etc/rc.subr ] && ! checkyesno cvm_log; then + cvm_logcmd=${cvm_nologcmd} fi umask 0 - command="@SETENV@ - ${cvm_postenv} @LOCALBASE@/bin/softlimit -m ${cvm_datalimit} @LOCALBASE@/bin/cvm-${cvm_module} cvm-${cvm_protocol}:@VARBASE@/run/cvm-${cvm_module} 2>&1 | @LOCALBASE@/bin/setuidgid cvmlog ${cvm_logcmd}" + command="@SETENV@ - ${cvm_postenv} +@PREFIX@/bin/softlimit -m ${cvm_datalimit} @PREFIX@/bin/cvm-${cvm_module} +cvm-${cvm_protocol}:@VARBASE@/run/cvm-${cvm_module} +2>&1 | +@PREFIX@/bin/setuidgid cvmlog ${cvm_logcmd}" command_args="&" rc_flags="" } |