Changeset 5597318

Timestamp:

06/27/2010 07:33:25 AM (14 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

7956b88

Parents:

c8595ed

Message:

Standardized urinary comparisons^{Cn tests}

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9324 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

bootscripts/contrib/lsb-v3

Files:

• ChangeLog (modified) (1 diff)
• init.d/checkfs (modified) (3 diffs)
• init.d/lfs-functions (modified) (2 diffs)
• init.d/localnet (modified) (4 diffs)
• init.d/rc (modified) (1 diff)
• init.d/sendsignals (modified) (2 diffs)
• init.d/udev (modified) (1 diff)
• lsb/init-functions (modified) (5 diffs)

bootscripts/contrib/lsb-v3/ChangeLog

@@ -2 +2 @@
 
 20100627 - [dj] * Sync to LFS-Bootscripts-20100627 (killall in new sysvinit).
+                * Standardized syntax for urinary comparisons in tests.
 
 20100529 - [matthew]

bootscripts/contrib/lsb-v3/init.d/checkfs

@@ -26 +26 @@
 
         mount -n -o remount,ro / >/dev/null
-        if [ ${?} != 0 ]
+        if [ ${?} -ne 0 ]
         then
             log_failure_msg "Mounting root file system in read-only mode"
@@ -54 +54 @@
         error_value=${?}
 
-        if [ "${error_value}" = 0 ]
+        if [ "${error_value}" -eq 0 ]
         then
             log_success_msg "Checking file systems..."
-        elif [ "${error_value}" = 1 ]
+        elif [ "${error_value}" -eq 1 ]
         then
             log_warning_msg "Checking file systems..."
@@ -64 +64 @@
             echo -e "${WARNING}corrected.  You may want to double-check that"
             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..."
             echo -e "${WARNING}WARNING:\n"

bootscripts/contrib/lsb-v3/init.d/lfs-functions

@@ -78 +78 @@
     STATUS=$?
     echo "Checking ${MESSAGE} status:"
-    if [ "${STATUS}" = "0" ]; then
+    if [ "${STATUS}" -eq "0" ]; then
         log_success_msg "Running with PID(s) ${pidlist}"
     else
@@ -203 +203 @@
     # Print messages for the generic force-reload, reload, restart, 
     # and try-restart targets
-    if [ "${error_value}" = "0" ]
+    if [ "${error_value}" -eq "0" ]
     then
         log_success_msg "${message}${MESSAGE} "

bootscripts/contrib/lsb-v3/init.d/localnet

@@ -23 +23 @@
         ip addr add 127.0.0.1/8 label lo dev lo
         ip link set lo up
-        if [ "${?}" = "0" ]
+        if [ "${?}" -eq "0" ]
                 then
                      log_success_msg "Bringing up the loopback interface..."
@@ -31 +31 @@
 
         hostname "${HOSTNAME}"
-        if [ "${?}" = "0" ]
+        if [ "${?}" -eq "0" ]
                 then
                      log_success_msg "Setting hostname to ${HOSTNAME}..."
@@ -42 +42 @@
     stop)
         ip link set lo down
-        if [ "${?}" = "0" ]
+        if [ "${?}" -eq "0" ]
                 then
                      log_success_msg "Bringing down the loopback interface..."
@@ -61 +61 @@
                 hostname "${HOSTNAME}"
                 retval=$(( "${retval}" + "${?}" ))
-                if [ "${retval}" = "0" ]
+                if [ "${retval}" -eq "0" ]
                 then
                     log_success_msg "Restarting local network..."

bootscripts/contrib/lsb-v3/init.d/rc

@@ -120 +120 @@
         error_value=${?}
 
-        if [ "${error_value}" != "0" ]; then
+        if [ "${error_value}" -ne "0" ]; then
             print_error_msg
         fi

bootscripts/contrib/lsb-v3/init.d/sendsignals

@@ -23 +23 @@
         error_value=${?}
         # Account for successful return value of 2
-        if [ ${error_value} = 2 ]
-            error_value="0"
+        if [ ${error_value} -eq 2 ]
+            error_value=0
         fi
         sleep 3
@@ -35 +35 @@
         error_value=${?}
         # Account for successful return value of 2
-        if [ ${error_value} = 2 ]
-            error_value="0"
+        if [ ${error_value} -eq 2 ]
+            error_value=0
         fi
 

bootscripts/contrib/lsb-v3/init.d/udev

@@ -41 +41 @@
                         mount -n -t tmpfs tmpfs /dev -o mode=755
                 fi
-                if [ ${?} != 0 ]; then
+                if [ ${?} -ne 0 ]; then
                         echo_failure
                         boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}

bootscripts/contrib/lsb-v3/lsb/init-functions

@@ -202 +202 @@
     # Check for a valid signal
     check_signal "${signal}"
-    if [ "${?}" != "0" ]
+    if [ "${?}" -ne "0" ]
     then
         return 2
@@ -279 +279 @@
                     # Wait up to ${delay}/10 seconds to for "${pid}" to 
                     # terminate in 10ths of a second
-                    while [ "${delay}" != "0" ]
+                    while [ "${delay}" -ne "0" ]
                     do
                         kill -0 "${pid}" 2> /dev/null || piddead="1"
@@ -414 +414 @@
     do
         kill -0 ${pid} 2> /dev/null
-        if [ "${?}" = "0" ]; then
+        if [ "${?}" -eq "0" ]; then
             lpids="${pids}${pid} "
         else
@@ -535 +535 @@
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null
-    if [ "${?}" = "0" ]
+    if [ "${?}" -eq "0" ]
     then
         return 0
@@ -567 +567 @@
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null
-    if [ "${?}" = "0" ]
+    if [ "${?}" -eq "0" ]
     then
         return 0