Changeset ceed481

Timestamp:

10/26/2008 06:58:59 AM (15 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.4, 6.5, 6.6, 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:

53eeda09

Parents:

6da4dd7

Message:

Added Dan Nicholson's patch for #2160, and cleaned up tab/spacing in changelog.

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

Location:

bootscripts

Files:

• ChangeLog (modified) (10 diffs)
• lfs/init.d/functions (modified) (5 diffs)

bootscripts/ChangeLog

@@ +1 @@
+2008-10-26      Dan Nicholson   <dnicholson@linuxfromscratch.org>
+        * lfs/init.d/functions: Remove stale pid files when encountered
+          in loadproc/killproc/reloadproc. When the bootscript specifies
+          a pid file to use with the "-p pidfile" argument, *proc
+          functions previously bailed out when the referenced file
+          contains an invalid pid.
+
 2008-10-23      DJ Lucas        <dj@linuxfromscratch.org>
         * lfs/init.d/console: Removed BROKEN_COMPOSE as kernel patch has
           been accepted upstream.
- 
+
 2008-05-21      Bryan Kadzban   <bryan@linuxfromscratch.org>
         * lfs/init.d/udev: lfs/init.d/udev_retry: Use new udevadm program.
@@ -101 +108 @@
         * Removed console config file and makefile targets.
         * Removed references to /dev/bug and bugreport in udevand 
-          udev_retry bootscripts. (DJ Lucas)
+          udev_retry bootscripts. (DJ Lucas)
 n/a - April 17, 2006
         * Updated udev script to use the new udevsettle program.
@@ -109 +116 @@
 n/a - April 15, 2006
         * Cleaned up contrib directory.  Removed: contrib/init.d, 
-          contrib/enhanced, contrib/livecd, contrib/hotplug, and raq2 
+          contrib/enhanced, contrib/livecd, contrib/hotplug, and raq2 
           patch. (DJ Lucas)
 
 n/a - April 14, 2006
-        * Merged changes from udev_update branch (DJ Lucas)
+        * Merged changes from udev_update branch (DJ Lucas)
         * Replaced a return with an exit and reversed comment changes in 
-          udev bootscript. (Dan Nicholson)
+          udev bootscript. (Dan Nicholson)
         * Replaced walk_sysfs function in udev bootscript with new udevtrigger
-          program and move wait_for_uevents function inline. (DJ Lucas)
+          program and move wait_for_uevents function inline. (DJ Lucas)
         * Removed extra evaluate_retval in udev bootscript. (Ken Moffat)
-        * Wait for uevents to be processed in the udev script.  See ticket #1720
-          for details. (Matthew Burgess)
+        * Wait for uevents to be processed in the udev script.  See ticket
+          #1720 for details. (Matthew Burgess)
 
 n/a - March 21, 2006
-        * Removed old references to boot_log function and arguments passed
-          to boot_mesg_flush in echo_* functions. (DJ Lucas)
+        * Removed old references to boot_log function and arguments passed
+          to boot_mesg_flush in echo_* functions. (DJ Lucas)
 
 n/a - March 10, 2006
         * Moved src argument to ipv4-static-route service script and 
-          removed from ipv4-static service script. (DJ Lucas)
+          removed from ipv4-static service script. (DJ Lucas)
 
 n/a - March 8. 2006
@@ -288 +295 @@
         * syslog-ng is now installed by default (Jeremy Utley)
         * hotplug is now installed by default (Jeremy Utley)
-        * udev now uses /sbin/hotplug as the default hotplug handler (Nathan Coulson)
+        * udev now uses /sbin/hotplug as the default hotplug handler
+          (Nathan Coulson)
         * udev now mounts a tmpfs instead of a ramfs onto /dev,
           as suggested by Greg K-H (Nathan Coulson)
@@ -355 +363 @@
 
 n/a - September 21, 2004
-        * boot_mesg has been enhanced.  Subsequent calls will overwrite previous
-          text, and it will wrap text basedupon the variable ${WCOL}. 
+        * boot_mesg has been enhanced.  Subsequent calls will overwrite
+          previous text, and it will wrap text basedupon the variable ${WCOL}. 
           (James Robertson)
         * Fixed mtu optional service typo (Kevin P Fleming)
@@ -807 +815 @@
         * Fixed Makefile rc.6 to reboot
         * Added -s flag to grep command in rc.d/init.d/network -
-          suppresses an error if no ifconfig.* files exist
+          suppresses an error if no ifconfig.* files exist
 
 n/a - January 30, 2004:
@@ -828 +836 @@
 
         * New maintainers for the lfs-bootscripts package are:
-        Jeremy Utley (jeremy@linuxfromscratch.org)
-        Nathan Coulson (nathan@linuxfromscratch.org)
+          Jeremy Utley (jeremy@linuxfromscratch.org)
+          Nathan Coulson (nathan@linuxfromscratch.org)
 
 1.11 - February 3rd, 2003:
@@ -839 +847 @@
 
         * Fixed up checkfs to work with non-ext2 filesystems too (such as
-        minix).
+          minix).
 
 1.9 - April 5th, 2002:
@@ -885 +893 @@
 
         * replaced -o %PPID with -o $PPID throughout the functions script. This
-        construct does what it's supposed to do (don't take PPID into account
-        because this would fail if a running daemon and the bootscript have
-        the same name).
+          construct does what it's supposed to do (don't take PPID into account
+          because this would fail if a running daemon and the bootscript have
+          the same name).
 
         * added 'restart' to the swap script
@@ -915 +923 @@
 
         * removed the emptying of /etc/mtab since it's a symlink to
-         /proc/mounts now
+          /proc/mounts now
 
         * added the mountproc script which mounts the proc system. This is done

bootscripts/lfs/init.d/functions

@@ -292 +292 @@
         fi
 
+        # Warn about stale pid file
+        if [ "$?" = 1 ]; then
+                boot_mesg -n "Removing stale pid file: ${pidfile}. " ${WARNING}
+                rm -f "${pidfile}"
+        fi
+
         if [ -n "${pidlist}" ]; then
                 for pid in ${pidlist}
@@ -505 +511 @@
 #          return 4 - Program or service status is unknown
 #
-# Dependencies: nice
+# Dependencies: nice, rm
 #
 # Todo: LSB says this should be called start_daemon
@@ -568 +574 @@
                                 ;;
                         1)
-                                log_warning_msg "Unable to continue: ${pidfile} exists"
-                                return 0 # 4
+                                boot_mesg "Removing stale pid file: ${pidfile}" ${WARNING}
+                                rm -f "${pidfile}"
                                 ;;
                         3)
@@ -599 +605 @@
 #          return 4 - Unknown Status
 #
-# Dependencies: kill
+# Dependencies: kill, rm
 #
 # Todo: LSB does not say that it should call evaluate_retval
@@ -647 +653 @@
         else
                 pidofproc -s -p "${pidfile}" "${1}"
+        fi
+
+        # Remove stale pidfile
+        if [ "$?" = 1 ]; then
+                boot_mesg "Removing stale pid file: ${pidfile}." ${WARNING}
+                rm -f "${pidfile}"
         fi