浏览代码

Sync to main. Updated lsb-v3 scripts to account for change in sysvinit version.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9321 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
DJ Lucas 15 年之前
父节点
当前提交
d2abc4d35c
共有 2 个文件被更改,包括 10 次插入1 次删除
  1. 2 0
      bootscripts/contrib/lsb-v3/ChangeLog
  2. 8 1
      bootscripts/contrib/lsb-v3/init.d/sendsignals

+ 2 - 0
bootscripts/contrib/lsb-v3/ChangeLog

@@ -1,5 +1,7 @@
 ChangeLog
 
+20100627 - [dj] * Sync to LFS-Bootscripts-20100627 (killall in new sysvinit).
+
 20100529 - [matthew]
                 * Only copy /lib/udev/devices/null, as Udev >= 155 copies
                   devices from /lib/udev/devices to /dev itself.

+ 8 - 1
bootscripts/contrib/lsb-v3/init.d/sendsignals

@@ -21,7 +21,10 @@ case "${1}" in
         message="Sending all processes the TERM signal..."
         killall5 -15
         error_value=${?}
-
+        # Account for successful return value of 2
+        if [ ${error_value} == 2 ]
+            error_value="0"
+        fi
         sleep 3
 
         (exit ${error_value})
@@ -30,6 +33,10 @@ case "${1}" in
         message="Sending all processes the KILL signal..."
         killall5 -9
         error_value=${?}
+        # Account for successful return value of 2
+        if [ ${error_value} == 2 ]
+            error_value="0"
+        fi
 
         sleep 3