OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=58

kexec-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 13 16:41:27 CEST 2008 - bwalle@suse.de
+
+- Fix runlevels (Default-Start, Default-Stop) in kexec.init.
+- Only load kexec kernel when kexec reboot is enabled when the
+  target runlevel is 6 (reboot) to avoid slowdown of shutdown in
+  that case.
+
 -------------------------------------------------------------------
 Thu Oct 09 19:00:04 CEST 2008 - bwalle@suse.de
 

kexec-tools.spec

@@ -29,7 +29,7 @@ PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Summary:        Tools for fast kernel loading
 Version:        2.0.0
-Release:        39
+Release:        40
 Source:         %{name}-%{version}.tar.bz2
 Source1:        kexec-bootloader
 Source2:        kexec-bootloader.8.txt
@@ -146,6 +146,11 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
 %endif
 
 %changelog
+* Mon Oct 13 2008 bwalle@suse.de
+- Fix runlevels (Default-Start, Default-Stop) in kexec.init.
+- Only load kexec kernel when kexec reboot is enabled when the
+  target runlevel is 6 (reboot) to avoid slowdown of shutdown in
+  that case.
 * Thu Oct 09 2008 bwalle@suse.de
 - PPC64: Use return value of count_dyn_reconf_memory_ranges().
 * Thu Oct 09 2008 bwalle@suse.de

kexec.init

@@ -5,12 +5,12 @@
 #
 ### BEGIN INIT INFO
 # Provides:       kexec
-# Required-Start: $remote_fs
+# Required-Start: $null
 # Should-Start:
 # Should-Stop:
-# Required-Stop:  $remote_fs
+# Required-Stop:  $local_fs $remote_fs
-# Default-Start:  $null
+# Default-Start:  1 2 3 5 S
-# Default-Stop:   1 2 3 5
+# Default-Stop:   1 2 3 5 S
 # Short-Description: Enables reboot through kexec
 # Description:    Enables reboot through kexec
 ### END INIT INFO
@@ -23,6 +23,8 @@ case "$1" in
   start)
         ;;
   stop)
+        # Only execute that script if we're going to reboot the system.
+        if [ "$RUNLEVEL" -eq 6 ] ; then
             if ! [ -f /sys/kernel/kexec_loaded ] ; then
                 echo -n "Cannot check if kexec kernel has been loaded."
                 rc_failed
@@ -37,6 +39,10 @@ case "$1" in
                     rc_status -v
                 fi
             fi
+        else
+            echo "Loading kexec kernel ..."
+            rc_status -s
+        fi
         ;;
   status)
         echo "not implemented"