Author: gotar Date: Mon Feb 16 02:04:55 2009 New Revision: 10123 Modified: rc-scripts/trunk/rc.d/init.d/functions Log: - expand relative --pidfile to absolute /var/run path; ssd in killproc has broken plenty of daemons including amavisd-new, apache and clamav - dropped ancient /usr/X11R6/bin from $PATH
Modified: rc-scripts/trunk/rc.d/init.d/functions ============================================================================== --- rc-scripts/trunk/rc.d/init.d/functions (original) +++ rc-scripts/trunk/rc.d/init.d/functions Mon Feb 16 02:04:55 2009 @@ -13,7 +13,7 @@ # Łukasz Pawelczyk <[email protected]> # First set up a default search path. -export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin" +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" # Set defaults if [ -z "$COLUMNS" -o -z "$LINES" ]; then @@ -548,6 +548,7 @@ --pidfile) shift pidfile="$1" + [[ "$pidfile" != /* ]] && pidfile="/var/run/$pidfile" ;; --makepid) makepid=1 @@ -658,6 +659,7 @@ case $1 in --pidfile) pidfile="$2" + [[ "$pidfile" != /* ]] && pidfile="/var/run/$pidfile" shift 2 ;; --waitforname) @@ -815,6 +817,7 @@ typeset pid subsys daemon cpuset_msg pidfile if [ "$1" = "--pidfile" ]; then pidfile=$2 + [[ "$pidfile" != /* ]] && pidfile="/var/run/$pidfile" shift 2 fi _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
