CVS commit: pkgsrc/security/cvm/files

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Apr 27 20:21:51 UTC 2017

Modified Files:
        pkgsrc/security/cvm/files: cvm.sh

Log Message:
Wrap long command line. Replace LOCALBASE with PREFIX.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/cvm/files/cvm.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/cvm/files/cvm.sh
diff -u pkgsrc/security/cvm/files/cvm.sh:1.1.1.1 pkgsrc/security/cvm/files/cvm.sh:1.2
--- pkgsrc/security/cvm/files/cvm.sh:1.1.1.1    Wed Jul 20 03:28:42 2005
+++ pkgsrc/security/cvm/files/cvm.sh    Thu Apr 27 20:21:51 2017
@@ -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=""
 }