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

diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb
index 2bc87fd0e000cc41fac313a3a041d123a66cc2cf..0e5d4c00370aa3cfb4f0b7ff187fcd638e95745a 100755 (executable)
--- a/hooks/common/80-install-modules-deb
+++ b/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
 
 #

diff --git a/hooks/common/81-install-modules-init-tools b/hooks/common/81-install-modules-init-tools
new file mode 100755 (executable)
index 0000000..d5216f2
--- /dev/null
+++ b/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

diff --git a/hooks/dapper/81-install-modules-init-tools b/hooks/dapper/81-install-modules-init-tools
new file mode 120000 (symlink)
index 0000000..913d783
--- /dev/null
+++ b/hooks/dapper/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
\ No newline at end of file

diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel
index 85beeb216fe0d01f505dc62e6aca81b232eb1de5..5533f556ac9ea6664d7e0c290754c5f349bad813 100755 (executable)
--- a/hooks/debian/80-install-kernel
+++ b/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

diff --git a/hooks/debian/81-install-modules-init-tools b/hooks/debian/81-install-modules-init-tools
new file mode 120000 (symlink)
index 0000000..913d783
--- /dev/null
+++ b/hooks/debian/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
\ No newline at end of file

diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel
index 5e851267171664f2a3fbe9bb5f4c36d91d213173..7b047bf1acc2d1be408cb27da4c2d4dc294c8389 100755 (executable)
--- a/hooks/edgy/80-install-kernel
+++ b/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

diff --git a/hooks/edgy/81-install-modules-init-tools b/hooks/edgy/81-install-modules-init-tools
new file mode 120000 (symlink)
index 0000000..913d783
--- /dev/null
+++ b/hooks/edgy/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
\ No newline at end of file

diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index e979715b616bbbab18ae4d410709a20c200d6056..0cbb82160641a887245b530261d74046f1067344 100755 (executable)
--- a/hooks/intrepid/80-install-kernel
+++ b/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

diff --git a/hooks/intrepid/81-install-modules-init-tools b/hooks/intrepid/81-install-modules-init-tools
new file mode 120000 (symlink)
index 0000000..913d783
--- /dev/null
+++ b/hooks/intrepid/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
\ No newline at end of file

diff --git a/hooks/karmic/80-install-kernel b/hooks/karmic/80-install-kernel
index b136b4a01fd3c31ddfd122503e57bce790fddaec..4ab58c678ce24e9e4b93723a0f5613c1cebd77c8 100755 (executable)
--- a/hooks/karmic/80-install-kernel
+++ b/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

diff --git a/hooks/karmic/81-install-modules-init-tools b/hooks/karmic/81-install-modules-init-tools
new file mode 120000 (symlink)
index 0000000..913d783
--- /dev/null
+++ b/hooks/karmic/81-install-modules-init-tools
@@ -0,0 +1 @@
+../common/81-install-modules-init-tools
\ No newline at end of file