tags 600081 + pending tags 600455 + pending tags 600585 + pending thanks Dear maintainer,
I've prepared an NMU for vzctl (versioned as 3.0.24-7.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. -- .''`. http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Bloodhound Gang: Nothing But Mammals
diff -u vzctl-3.0.24/etc/init.d/initd-functions.in vzctl-3.0.24/etc/init.d/initd-functions.in
--- vzctl-3.0.24/etc/init.d/initd-functions.in
+++ vzctl-3.0.24/etc/init.d/initd-functions.in
@@ -85 +85,26 @@
+vzdaemon_start()
+{
+ case DISTR in
+ redhat)
+ daemon $*
+ ;;
+ suse)
+ startproc $*
+ ;;
+ debian)
+ start-stop-daemon --start --quiet --exec $*
+ ;;
+ esac
+}
+vzdaemon_stop()
+{
+ case DISTR in
+ redhat|suse)
+ killproc $*
+ ;;
+ debian)
+ start-stop-daemon --stop --quiet --exec $*
+ ;;
+ esac
+}
diff -u vzctl-3.0.24/etc/init.d/vzeventd-redhat.in vzctl-3.0.24/etc/init.d/vzeventd-redhat.in
--- vzctl-3.0.24/etc/init.d/vzeventd-redhat.in
+++ vzctl-3.0.24/etc/init.d/vzeventd-redhat.in
@@ -61,7 +61,7 @@
check || exit 1
echo -n $"Starting $prog: "
- daemon $prog $OPTIONS
+ vzdaemon_start $prog $OPTIONS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch $lockfile
@@ -71,7 +71,7 @@
stop() {
[ "$EUID" != "0" ] && exit 4
echo -n $"Shutting down $prog: "
- killproc $prog
+ vzdaemon_stop $prog
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f $lockfile
diff -u vzctl-3.0.24/debian/vzctl.postrm vzctl-3.0.24/debian/vzctl.postrm
--- vzctl-3.0.24/debian/vzctl.postrm
+++ vzctl-3.0.24/debian/vzctl.postrm
@@ -31,7 +31,7 @@
/etc/cron.d/vpsnetclean,disabled \
/etc/cron.d/vpsreboot,disabled
# Upgrade path for old (lenny version) of vz cron scripts.
- rm -f
+ rm -f \
/etc/cron.d/vz \
/etc/cron.d/vz,disabled \
/etc/vz/cron/vz
diff -u vzctl-3.0.24/debian/vzctl.postinst vzctl-3.0.24/debian/vzctl.postinst
--- vzctl-3.0.24/debian/vzctl.postinst
+++ vzctl-3.0.24/debian/vzctl.postinst
@@ -23,7 +23,7 @@
if [ -x "/etc/init.d/vz" ] ; then
update-rc.d vz defaults >/dev/null
fi
- if [ -x "/etc/inid.d/vz" ] ; then
+ if [ -x "/etc/init.d/vzeventd" ] ; then
update-rc.d vzeventd defaults >/dev/null
fi
# No idea to start here as no virtual host can have been configured
diff -u vzctl-3.0.24/debian/changelog vzctl-3.0.24/debian/changelog
--- vzctl-3.0.24/debian/changelog
+++ vzctl-3.0.24/debian/changelog
@@ -1,3 +1,20 @@
+vzctl (3.0.24-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Florian Ernst ]
+ * debian/vzctl.postrm: correctly extend line in Lenny cleanup.
+ Closes: #600585.
+
+ [ gregor herrmann ]
+ * Fix "typo in postinst breaks ct reboot feature / vzeventd isn't
+ start at bootup": check for the correct init script; patch by Thorsten
+ Schifferdecker (closes: #600081).
+ * Fix "ct reboot feature broken - part II"; store and apply upstream patch
+ that uses start-stop-daemon (closes: #600455).
+
+ -- gregor herrmann <[email protected]> Tue, 26 Oct 2010 21:49:04 +0200
+
vzctl (3.0.24-7) unstable; urgency=medium
* No longer ignore errors on startup.
only in patch2:
unchanged:
--- vzctl-3.0.24.orig/debian/patches/insserv-solution-part14.patch
+++ vzctl-3.0.24/debian/patches/insserv-solution-part14.patch
@@ -0,0 +1,68 @@
+From: Kir Kolyshkin <[email protected]>
+Date: Wed, 8 Sep 2010 08:51:17 +0000 (+0400)
+Subject: init.d/vzeventd: fix to support Debian and SUSE
+X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=043e3cc76e590574d736f9830098d6bddf5bba76
+
+init.d/vzeventd: fix to support Debian and SUSE
+
+Well, this wasn't tested yet, but I hope I did it right.
+
+Signed-off-by: Kir Kolyshkin <[email protected]>
+---
+
+diff --git a/etc/init.d/initd-functions.in b/etc/init.d/initd-functions.in
+index b84a6e4..b6bdbc7 100644
+--- a/etc/init.d/initd-functions.in
++++ b/etc/init.d/initd-functions.in
+@@ -83,4 +83,29 @@ __echo()
+ fi
+ }
+
++vzdaemon_start()
++{
++ case DISTR in
++ redhat)
++ daemon $*
++ ;;
++ suse)
++ startproc $*
++ ;;
++ debian)
++ start-stop-daemon --start --quiet --exec $*
++ ;;
++ esac
++}
+
++vzdaemon_stop()
++{
++ case DISTR in
++ redhat|suse)
++ killproc $*
++ ;;
++ debian)
++ start-stop-daemon --stop --quiet --exec $*
++ ;;
++ esac
++}
+diff --git a/etc/init.d/vzeventd-redhat.in b/etc/init.d/vzeventd-redhat.in
+index 14c3130..ce70976 100755
+--- a/etc/init.d/vzeventd-redhat.in
++++ b/etc/init.d/vzeventd-redhat.in
+@@ -60,7 +60,7 @@ start() {
+ check || exit 1
+
+ echo -n $"Starting $prog: "
+- daemon $prog $OPTIONS
++ vzdaemon_start $prog $OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch $lockfile
+@@ -70,7 +70,7 @@ start() {
+ stop() {
+ [ "$EUID" != "0" ] && exit 4
+ echo -n $"Shutting down $prog: "
+- killproc $prog
++ vzdaemon_stop $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f $lockfile
signature.asc
Description: Digital signature
