Factor out module-init-tools (or kmod) installation

hooks/common/80-install-modules-deb

@@ -73,19 +73,6 @@ else
     cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
 fi
 
-#
-#  Install either kmod or module-init-tools package.
-#
-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
 
 #

hooks/common/81-install-modules-init-tools

@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+#  Ensure that either modules-init-tools or kmod is setup.
+#
+#  This is required in most setups.  But even if it isn't required it
+# can't really do anything bad; just waste a bit of space.
+#
+
+prefix=$1
+
+
+
+#
+#  Source our common functions
+#
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+
+#
+# Log our start
+#
+logMessage Script $0 starting
+
+#
+#  Install either kmod or module-init-tools package.
+#
+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
+
+#
+#  Log our finish
+#
+logMessage Script $0 finished

hooks/dapper/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools

hooks/debian/80-install-kernel

@@ -120,12 +120,6 @@ initrd          /boot/$DOMU_RAMDISK
 
 E_O_MENU
 
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
-
 else
     logMessage pygrub not set, skipping kernel install
 fi # if pygrub

hooks/debian/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools

hooks/edgy/80-install-kernel

@@ -95,11 +95,6 @@ initrd          /boot/$DOMU_RAMDISK
 
 E_O_MENU
 
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install

hooks/edgy/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools

hooks/intrepid/80-install-kernel

@@ -85,11 +85,7 @@ initrd          /boot/$DOMU_RAMDISK
 
 E_O_MENU
 
-#
-#  Install the module-init-tools package.
-#
 
-installDebianPackage ${prefix} module-init-tools
 
 else
     logMessage pygrub not set, skipping kernel install

hooks/intrepid/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools

hooks/karmic/80-install-kernel

@@ -75,12 +75,6 @@ else
     logMessage "Package '${linux_kernel_package}' is not available"
 fi
 
-#
-#  Install the module-init-tools package.
-#
-
-installDebianPackage ${prefix} module-init-tools
-
 else
     logMessage pygrub not set, skipping kernel install
 fi # if pygrub

hooks/karmic/81-install-modules-init-tools

@@ -0,0 +1 @@
+../common/81-install-modules-init-tools