Author: nathan
Date: 2005-03-16 23:49:11 -0700 (Wed, 16 Mar 2005)
New Revision: 4773
Modified:
trunk/bootscripts/CHANGELOG
trunk/bootscripts/lfs/init.d/functions
Log:
Fixed killproc's Output
Modified: trunk/bootscripts/CHANGELOG
===================================================================
--- trunk/bootscripts/CHANGELOG 2005-03-17 03:09:15 UTC (rev 4772)
+++ trunk/bootscripts/CHANGELOG 2005-03-17 06:49:11 UTC (rev 4773)
@@ -3,6 +3,7 @@
Moved compatibility code into one single function.
(Nathan Coulson)
* Readded the ONHOTPLUG option for ifup/ifdown (Nathan Coulson)
+ * Fixed killproc's output
n/a - March 01, 2005
* Added CHECK_LINK variable in ifconfig.*/*, so if the
Modified: trunk/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/bootscripts/lfs/init.d/functions 2005-03-17 03:09:15 UTC (rev
4772)
+++ trunk/bootscripts/lfs/init.d/functions 2005-03-17 06:49:11 UTC (rev
4773)
@@ -488,7 +488,7 @@
}
#*******************************************************************************
-# Function - load_proc [-f] [-n nicelevel] [-p pidfile] pathname [args]
+# Function - loadproc [-f] [-n nicelevel] [-p pidfile] pathname [args]
#
# Purpose: This runs the specified program as a daemon
#
@@ -661,7 +661,7 @@
done
if [ -z "${killsig}" ]; then
- pidofproc "${1}" 2> /dev/null
+ pidofproc "${1}" > /dev/null
# Program was terminated
if [ "$?" != "0" ]; then
@@ -669,15 +669,17 @@
if [ -f "${pidfile}" ]; then
rm -f "${pidfile}"
fi
+ echo_ok
return 0
else # Program is still running
+ echo_failure
return 4 # Unknown Status
fi
else
if [ -z "${pidfile}" ]; then
- pidofproc "${1}" 2> /dev/null
+ pidofproc "${1}" > /dev/null
else
- pidofproc -p "${pidfile}" "${1}" 2> /dev/null
+ pidofproc -p "${pidfile}" "${1}" > /dev/null
fi
fi
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
