gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 11:49:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardized urinary comparisons^Cn tests

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9324 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2010-06-27 07:33:25 +00:00
parent c8595ed645
commit 559731897e
8 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootscripts/contrib/lsb-v3/ChangeLog
View File

@ -1,6 +1,7 @@
ChangeLog ChangeLog
20100627 - [dj] * Sync to LFS-Bootscripts-20100627 (killall in new sysvinit). 20100627 - [dj] * Sync to LFS-Bootscripts-20100627 (killall in new sysvinit).
* Standardized syntax for urinary comparisons in tests.
20100529 - [matthew] 20100529 - [matthew]
* Only copy /lib/udev/devices/null, as Udev >= 155 copies * Only copy /lib/udev/devices/null, as Udev >= 155 copies

8
bootscripts/contrib/lsb-v3/init.d/checkfs
View File

@ -25,7 +25,7 @@ case "${1}" in
fi fi
mount -n -o remount,ro / >/dev/null mount -n -o remount,ro / >/dev/null
if [ ${?} != 0 ] if [ ${?} -ne 0 ]
then then
log_failure_msg "Mounting root file system in read-only mode" log_failure_msg "Mounting root file system in read-only mode"
echo -e "${FAILURE}FAILURE:\n" echo -e "${FAILURE}FAILURE:\n"
@ -53,17 +53,17 @@ case "${1}" in
fsck ${options} -a -A -C -T fsck ${options} -a -A -C -T
error_value=${?} error_value=${?}
if [ "${error_value}" = 0 ] if [ "${error_value}" -eq 0 ]
then then
log_success_msg "Checking file systems..." log_success_msg "Checking file systems..."
elif [ "${error_value}" = 1 ] elif [ "${error_value}" -eq 1 ]
then then
log_warning_msg "Checking file systems..." log_warning_msg "Checking file systems..."
echo -e "${WARNING}WARNING:\n" echo -e "${WARNING}WARNING:\n"
echo -e "${WARNING}File system errors were found and have been" echo -e "${WARNING}File system errors were found and have been"
echo -e "${WARNING}corrected. You may want to double-check that" echo -e "${WARNING}corrected. You may want to double-check that"
echo -e "${WARNING}everything was fixed properly.${NORMAL}" echo -e "${WARNING}everything was fixed properly.${NORMAL}"
elif [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then elif [ "${error_value}" -eq 2 -o "${error_value}" -eq 3 ]; then
log_warning_msg "Checking file systems..." log_warning_msg "Checking file systems..."
echo -e "${WARNING}WARNING:\n" echo -e "${WARNING}WARNING:\n"
echo -e "${WARNING}File system errors were found and have been been" echo -e "${WARNING}File system errors were found and have been been"

4
bootscripts/contrib/lsb-v3/init.d/lfs-functions
View File

@ -77,7 +77,7 @@ statusproc()
pidlist=`pidofproc "${BIN_FILE}"` pidlist=`pidofproc "${BIN_FILE}"`
STATUS=$? STATUS=$?
echo "Checking ${MESSAGE} status:" echo "Checking ${MESSAGE} status:"
if [ "${STATUS}" = "0" ]; then if [ "${STATUS}" -eq "0" ]; then
log_success_msg "Running with PID(s) ${pidlist}" log_success_msg "Running with PID(s) ${pidlist}"
else else
log_warning_msg "Not running!" log_warning_msg "Not running!"
@ -202,7 +202,7 @@ evaluate_retval()
# Print messages for the generic force-reload, reload, restart, # Print messages for the generic force-reload, reload, restart,
# and try-restart targets # and try-restart targets
if [ "${error_value}" = "0" ] if [ "${error_value}" -eq "0" ]
then then
log_success_msg "${message}${MESSAGE} " log_success_msg "${message}${MESSAGE} "
return "${error_value}" return "${error_value}"

8
bootscripts/contrib/lsb-v3/init.d/localnet
View File

@ -22,7 +22,7 @@ case "${1}" in
start) start)
ip addr add 127.0.0.1/8 label lo dev lo ip addr add 127.0.0.1/8 label lo dev lo
ip link set lo up ip link set lo up
if [ "${?}" = "0" ] if [ "${?}" -eq "0" ]
then then
log_success_msg "Bringing up the loopback interface..." log_success_msg "Bringing up the loopback interface..."
else else
@ -30,7 +30,7 @@ case "${1}" in
fi fi
hostname "${HOSTNAME}" hostname "${HOSTNAME}"
if [ "${?}" = "0" ] if [ "${?}" -eq "0" ]
then then
log_success_msg "Setting hostname to ${HOSTNAME}..." log_success_msg "Setting hostname to ${HOSTNAME}..."
else else
@ -41,7 +41,7 @@ case "${1}" in
stop) stop)
ip link set lo down ip link set lo down
if [ "${?}" = "0" ] if [ "${?}" -eq "0" ]
then then
log_success_msg "Bringing down the loopback interface..." log_success_msg "Bringing down the loopback interface..."
else else
@ -60,7 +60,7 @@ case "${1}" in
retval=$(( "${retval}" + "${?}" )) retval=$(( "${retval}" + "${?}" ))
hostname "${HOSTNAME}" hostname "${HOSTNAME}"
retval=$(( "${retval}" + "${?}" )) retval=$(( "${retval}" + "${?}" ))
if [ "${retval}" = "0" ] if [ "${retval}" -eq "0" ]
then then
log_success_msg "Restarting local network..." log_success_msg "Restarting local network..."
else else

2
bootscripts/contrib/lsb-v3/init.d/rc
View File

@ -119,7 +119,7 @@ if [ "${prevlevel}" != "N" ]; then
${link} stop ${link} stop
error_value=${?} error_value=${?}
if [ "${error_value}" != "0" ]; then if [ "${error_value}" -ne "0" ]; then
print_error_msg print_error_msg
fi fi
done done

8
bootscripts/contrib/lsb-v3/init.d/sendsignals
View File

@ -22,8 +22,8 @@ case "${1}" in
killall5 -15 killall5 -15
error_value=${?} error_value=${?}
# Account for successful return value of 2 # Account for successful return value of 2
if [ ${error_value} = 2 ] if [ ${error_value} -eq 2 ]
error_value="0" error_value=0
fi fi
sleep 3 sleep 3
@ -34,8 +34,8 @@ case "${1}" in
killall5 -9 killall5 -9
error_value=${?} error_value=${?}
# Account for successful return value of 2 # Account for successful return value of 2
if [ ${error_value} = 2 ] if [ ${error_value} -eq 2 ]
error_value="0" error_value=0
fi fi
sleep 3 sleep 3

2
bootscripts/contrib/lsb-v3/init.d/udev
View File

@ -40,7 +40,7 @@ case "${1}" in
if ! mountpoint /dev > /dev/null; then if ! mountpoint /dev > /dev/null; then
mount -n -t tmpfs tmpfs /dev -o mode=755 mount -n -t tmpfs tmpfs /dev -o mode=755
fi fi
if [ ${?} != 0 ]; then if [ ${?} -ne 0 ]; then
echo_failure echo_failure
boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE} boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
boot_mesg -n " onto /dev, this system will be halted." boot_mesg -n " onto /dev, this system will be halted."

10
bootscripts/contrib/lsb-v3/lsb/init-functions
View File

@ -201,7 +201,7 @@ killproc()
# Check for a valid signal # Check for a valid signal
check_signal "${signal}" check_signal "${signal}"
if [ "${?}" != "0" ] if [ "${?}" -ne "0" ]
then then
return 2 return 2
fi fi
@ -278,7 +278,7 @@ killproc()
kill "${signal}" "${pid}" 2> /dev/null kill "${signal}" "${pid}" 2> /dev/null
# Wait up to ${delay}/10 seconds to for "${pid}" to # Wait up to ${delay}/10 seconds to for "${pid}" to
# terminate in 10ths of a second # terminate in 10ths of a second
while [ "${delay}" != "0" ] while [ "${delay}" -ne "0" ]
do do
kill -0 "${pid}" 2> /dev/null || piddead="1" kill -0 "${pid}" 2> /dev/null || piddead="1"
if [ "${piddead}" = "1" ] if [ "${piddead}" = "1" ]
@ -413,7 +413,7 @@ local exitstatus="0"
for pid in ${pidlist} for pid in ${pidlist}
do do
kill -0 ${pid} 2> /dev/null kill -0 ${pid} 2> /dev/null
if [ "${?}" = "0" ]; then if [ "${?}" -eq "0" ]; then
lpids="${pids}${pid} " lpids="${pids}${pid} "
else else
exitstatus="1" exitstatus="1"
@ -534,7 +534,7 @@ check_signal()
valsig="${valsig} -11 -13 -14 -15" valsig="${valsig} -11 -13 -14 -15"
echo "${valsig}" | grep -- " ${1} " > /dev/null echo "${valsig}" | grep -- " ${1} " > /dev/null
if [ "${?}" = "0" ] if [ "${?}" -eq "0" ]
then then
return 0 return 0
else else
@ -566,7 +566,7 @@ check_sig_type()
valsig="-ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15" valsig="-ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15"
echo "${valsig}" | grep -- " ${1} " > /dev/null echo "${valsig}" | grep -- " ${1} " > /dev/null
if [ "${?}" = "0" ] if [ "${?}" -eq "0" ]
then then
return 0 return 0
else else