Handle module-init-tools → kmod transition in wheezy/raring gracefully

diff --git a/debian/changelog b/debian/changelog
index 73898957bd486b73b32b6b4347d058aca3b28052..e46c5c200bb4601cae4fd62213b87328420f598c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     - Makefile accepts DESTDIR=…
     - Move examples from debian/examples to examples.
     - Uses File::Which, added (build-) dependency on libfile-which-perl
+    - Knows about module-init-tools → kmod transition in wheezy/raring.
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:

diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb
index 45905ff8a1118e39080a9f41aeefa394249cae0b..2bc87fd0e000cc41fac313a3a041d123a66cc2cf 100755 (executable)
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -74,9 +74,17 @@ else
 fi
 
 #
-#  Install the module-init-tools package.
+#  Install either kmod or module-init-tools package.
 #
-installDebianPackage ${prefix} module-init-tools
+if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
+    if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
+        installDebianPackage ${prefix} kmod
+    else
+        installDebianPackage ${prefix} module-init-tools
+    fi
+else
+    installDebianPackage ${prefix} kmod
+fi
 
 fi # if pygrub