[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.4-1

[Iustin Pop]

The following commit has been merged in the master branch:
commit 1182f546ac95418e913f5a5525fdb6fd1fae1e35
Author: Iustin Pop <iusty at k1024.org>
Date:   Fri Dec 4 16:59:57 2009 +0100

    Remove patches applied upstream
    
    This removes the insserv dependencies and the hwloader fix.

diff --git a/debian/patches/fix-hvmloader-path.patch b/debian/patches/fix-hvmloader-path.patch
deleted file mode 100644
index 003270f..0000000
--- a/debian/patches/fix-hvmloader-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix bug #528618
-
-This modifies ganeti's hardcoded Xen hvmloader patch (which is fixed in
-upstream via a configure-time option in the 2.1 series).
-
-This will need adjusting with each change in the Xen packaging
-(xen-utils-…).
-
-Iustin Pop <iusty at k1024.org> Sat, 25 Jul 2009 12:21:46 +0200
---- a/lib/hypervisor/hv_xen.py
-+++ b/lib/hypervisor/hv_xen.py
-@@ -589,7 +589,7 @@
- 
-     config = StringIO()
-     config.write("# this is autogenerated by Ganeti, please do not edit\n#\n")
--    config.write("kernel = '/usr/lib/xen/boot/hvmloader'\n")
-+    config.write("kernel = '/usr/lib/xen-unstable/boot/hvmloader'\n")
-     config.write("builder = 'hvm'\n")
-     config.write("memory = %d\n" % instance.beparams[constants.BE_MEMORY])
-     config.write("vcpus = %d\n" % instance.beparams[constants.BE_VCPUS])
diff --git a/debian/patches/fix-innserv-dependencies.patch b/debian/patches/fix-innserv-dependencies.patch
deleted file mode 100644
index 08ab74e..0000000
--- a/debian/patches/fix-innserv-dependencies.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This patch removes xend from the list of dependencies.
-
-Ganeti doesn't need xend running to startup, it will only need it later (and
-only if xen is used as virtualisation technology). It also removes 'Xen'
-from the description in the init script.
-
-Iustin Pop <iusty at k1024.org>
-Tue, 04 Aug 2009 21:23:07 +0200
---- a/doc/examples/ganeti.initd.in
-+++ b/doc/examples/ganeti.initd.in
-@@ -3,12 +3,12 @@
- # based on skeleton from Debian GNU/Linux
- ### BEGIN INIT INFO
- # Provides:          ganeti
--# Required-Start:    $syslog $remote_fs xend
--# Required-Stop:     $syslog $remote_fs xend
-+# Required-Start:    $syslog $remote_fs
-+# Required-Stop:     $syslog $remote_fs
- # Default-Start:     2 3 4 5
- # Default-Stop:      0 1 6
--# Short-Description: Ganeti Xen Cluster Manager
--# Description:       Ganeti Xen Cluster Manager
-+# Short-Description: Ganeti Cluster Manager
-+# Description:       Ganeti Cluster Manager
- ### END INIT INFO
- 
- PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
diff --git a/debian/patches/series b/debian/patches/series
index 0986e48..2465d9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-innserv-dependencies.patch
 fix-startup-with-old-config.patch
-fix-hvmloader-path.patch

-- 
Ganeti packaging