[Pkg-xen-changes] r151 - trunk/xen-3.0/debian/patches

[Julien Danjou]

Author: acid
Date: 2006-04-05 14:19:56 +0000 (Wed, 05 Apr 2006)
New Revision: 151

Removed:
   trunk/xen-3.0/debian/patches/10sysconfig.dpatch
   trunk/xen-3.0/debian/patches/init.d.dpatch
Log:
remove unused patches


Deleted: trunk/xen-3.0/debian/patches/10sysconfig.dpatch
===================================================================
--- trunk/xen-3.0/debian/patches/10sysconfig.dpatch	2006-04-05 09:27:25 UTC (rev 150)
+++ trunk/xen-3.0/debian/patches/10sysconfig.dpatch	2006-04-05 14:19:56 UTC (rev 151)
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10sysconfig.dpatch by Ralph Passgang <ralph at debianbase.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move xendomains init script config file from /etc/sysconfig to /etc/default
-
- at DPATCH@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2006-02-16 23:44:08.000000000 +0100
-+++ b/Makefile	2006-02-18 01:34:35.659936303 +0100
-@@ -173,7 +173,6 @@
- 	rm -rf $(D)/etc/hotplug/xen-backend.agent
- 	rm -f  $(D)/etc/udev/rules.d/xen-backend.rules
- 	rm -f  $(D)/etc/udev/xen-backend.rules
--	rm -f  $(D)/etc/sysconfig/xendomains
- 	rm -rf $(D)/var/run/xen* $(D)/var/lib/xen*
- 	rm -rf $(D)/boot/*xen*
- 	rm -rf $(D)/lib/modules/*xen*
-diff -Naur a/tools/examples/init.d/xendomains b/tools/examples/init.d/xendomains
---- a/tools/examples/init.d/xendomains	2006-02-16 23:44:08.000000000 +0100
-+++ b/tools/examples/init.d/xendomains	2006-02-18 01:34:35.659936303 +0100
-@@ -35,7 +35,7 @@
- fi
- 
- LOCKFILE=/var/lock/subsys/xendomains
--XENDOM_CONFIG=/etc/sysconfig/xendomains
-+XENDOM_CONFIG=/etc/default/xendomains
- 
- test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
- 	if [ "$1" = "stop" ]; then exit 0;
-diff -Naur a/tools/examples/Makefile b/tools/examples/Makefile
---- a/tools/examples/Makefile	2006-02-16 23:44:08.000000000 +0100
-+++ b/tools/examples/Makefile	2006-02-18 01:35:13.225266374 +0100
-@@ -56,10 +56,8 @@
- 
- install-initd:
- 	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
--	[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
- 	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
- 	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
--	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
- 
- install-configs: $(XEN_CONFIGS)
- 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
-@@ -70,6 +68,8 @@
- 	    do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
- 	done
-+	[ -d $(DESTDIR)/etc/default ] || $(INSTALL_DIR) $(DESTDIR)/etc/default
-+	$(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/default/xendomains
- 
- install-scripts:
- 	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \

Deleted: trunk/xen-3.0/debian/patches/init.d.dpatch
===================================================================
--- trunk/xen-3.0/debian/patches/init.d.dpatch	2006-04-05 09:27:25 UTC (rev 150)
+++ trunk/xen-3.0/debian/patches/init.d.dpatch	2006-04-05 14:19:56 UTC (rev 151)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## init.d.dpatch by Julien Danjou <acid at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch init.d scripts
-
- at DPATCH@
-diff -ru xen-3.0.1.orig/tools/examples/init.d/xend xen-3.0.1/tools/examples/init.d/xend
---- xen-3.0.1.orig/tools/examples/init.d/xend	2006-01-31 17:09:20.000000000 +0100
-+++ xen-3.0.1/tools/examples/init.d/xend	2006-03-21 18:27:18.000000000 +0100
-@@ -7,7 +7,9 @@
- # chkconfig: 2345 98 01
- # description: Starts and stops the Xen control daemon.
- 
--if ! [ -e /proc/xen/privcmd ]; then
-+XENSTORED_RUN_DIR="/var/run/xenstored"
-+
-+if [ ! -e /proc/xen/privcmd -a -x /usr/sbin/xend ]; then
- 	exit 0
- fi
- 
-@@ -27,6 +29,7 @@
- 
- case "$1" in
-   start)
-+	[ -d "$XENSTORED_RUN_DIR" ] || mkdir -p "$XENSTORED_RUN_DIR"
- 	xend start
- 	await_daemons_up
- 	;;
-diff -ru xen-3.0.1.orig/tools/examples/init.d/xendomains xen-3.0.1/tools/examples/init.d/xendomains
---- xen-3.0.1.orig/tools/examples/init.d/xendomains	2006-01-31 17:09:20.000000000 +0100
-+++ xen-3.0.1/tools/examples/init.d/xendomains	2006-03-21 18:27:54.000000000 +0100
-@@ -30,7 +30,7 @@
- 
- # Correct exit code would probably be 5, but it's enough 
- # if xend complains if we're not running as privileged domain
--if ! [ -e /proc/xen/privcmd ]; then
-+if [ ! -e /proc/xen/privcmd -a -x /usr/sbin/xm ]; then
- 	exit 0
- fi
- 
-@@ -474,7 +474,7 @@
-     restart)
- 	restart
- 	;;
--    reload)
-+    reload|force-reload)
- 	reload
- 	;;
- 
-@@ -492,7 +492,7 @@
- 	;;
- 
-     *)
--	echo "Usage: $0 {start|stop|restart|reload|status}"
-+	echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
- 	rc_failed 3
- 	rc_status -v
- 	;;