Hi Khalid,

Attached is the diff for my kexec-tools 1.101-2.1 NMU.

This adds support for init.d scripts. I have uploaded it to delayed/5 so
you can still bypass it or remove it during the next five days.

I am pushing this forward in order to have it entering etch before the
general freeze.

Cheers
-- 
Julien Danjou
.''`.  Debian Developer
: :' : http://julien.danjou.info
`. `'  http://people.debian.org/~acid
  `-   9A0D 5FD9 EB42 22F6 8974  C95C A462 B51E C2FE E5CD
diff -u kexec-tools-1.101/debian/changelog kexec-tools-1.101/debian/changelog
--- kexec-tools-1.101/debian/changelog
+++ kexec-tools-1.101/debian/changelog
@@ -1,3 +1,11 @@
+kexec-tools (1.101-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add support for init scripts (Closes: #387599, #378880, #344489)
+  * Bumped Standards Version
+
+ -- Julien Danjou <[EMAIL PROTECTED]>  Mon,  2 Oct 2006 14:42:42 +0200
+
 kexec-tools (1.101-2) unstable; urgency=low
 
   * Fixed build failures (closes: Bug#327639, Bug#327715)
diff -u kexec-tools-1.101/debian/control kexec-tools-1.101/debian/control
--- kexec-tools-1.101/debian/control
+++ kexec-tools-1.101/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Khalid Aziz <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), dpatch, gnu-efi (>=3.0a-4)[ia64]
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: kexec-tools
 Architecture: any
diff -u kexec-tools-1.101/debian/rules kexec-tools-1.101/debian/rules
--- kexec-tools-1.101/debian/rules
+++ kexec-tools-1.101/debian/rules
@@ -69,6 +69,8 @@
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
+       dh_installinit --no-start -r --name=kexec -- start 85 6 .
+       dh_installinit --no-start -r --name=kexec-load -- stop 39 6 .
        dh_installexamples
        dh_install
        dh_installman
only in patch2:
unchanged:
--- kexec-tools-1.101.orig/debian/kexec.init.d
+++ kexec-tools-1.101/debian/kexec.init.d
@@ -0,0 +1,43 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:            kexec
+# Required-Start:      kexec-load
+# Required-Stop:   
+# Should-Start:
+# Default-Start:
+# Default-Stop:                6
+# Short-Description: Execute the reboot command with kexec.
+# Description:
+### END INIT INFO
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+. /lib/lsb/init-functions
+
+test -r /etc/default/kexec && . /etc/default/kexec
+
+do_stop () {
+    if [ "$USE_KEXEC" = 1 ]
+    then
+       log_action_msg "Will now restart"
+        kexec -e
+        log_failure_msg "kexec failed"
+    fi
+}
+
+case "$1" in
+  start)
+       # No-op
+       ;;
+  restart|reload|force-reload)
+       echo "Error: argument '$1' not supported" >&2
+       exit 3
+       ;;
+  stop)
+       do_stop
+       ;;
+  *)
+       echo "Usage: $0 start|stop" >&2
+       exit 3
+       ;;
+esac
only in patch2:
unchanged:
--- kexec-tools-1.101.orig/debian/kexec-load.init.d
+++ kexec-tools-1.101/debian/kexec-load.init.d
@@ -0,0 +1,47 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:            kexec-load
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start:
+# Default-Stop:                6
+# Short-Description: Load kernel image with kexec
+# Description:
+### END INIT INFO
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+. /lib/lsb/init-functions
+
+test -r /etc/default/kexec && . /etc/default/kexec
+
+do_stop () {
+       test "$USE_KEXEC" = 1 || exit 0
+       test -x /sbin/kexec || exit 0
+
+       REAL_APPEND="$APPEND"
+
+       test -z "$REAL_APPEND" && REAL_APPEND="`cat /proc/cmdline`"
+       log_action_begin_msg "Loading new kernel image into memory"
+       kexec -l "$KERNEL_IMAGE" --initrd="$INITRD" --append="$REAL_APPEND"
+       log_action_end_msg $?
+}
+
+case "$1" in
+  start)
+       # No-op
+       ;;
+  restart|reload|force-reload)
+       echo "Error: argument '$1' not supported" >&2
+       exit 3
+       ;;
+  stop)
+       do_stop
+       ;;
+  *)
+       echo "Usage: $0 start|stop" >&2
+       exit 3
+       ;;
+esac
only in patch2:
unchanged:
--- kexec-tools-1.101.orig/debian/kexec.default
+++ kexec-tools-1.101/debian/kexec.default
@@ -0,0 +1,12 @@
+# Defaults for kexec initscript
+# sourced by /etc/init.d/kexec and /etc/init.d/kexec-load
+
+# Don't use it by default
+USE_KEXEC=0
+
+# Kernel and initrd image
+KERNEL_IMAGE="/vmlinuz"
+INITRD="/initrd.img"
+
+# If empty, use current /proc/cmdline
+APPEND=""

Attachment: signature.asc
Description: Digital signature

Reply via email to