From a2aa1b8a0232080ac582ba394efeedf8d6004295 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jan 2013 02:27:48 +0100 Subject: [PATCH] Factor out module-init-tools (or kmod) installation --- hooks/common/80-install-modules-deb | 13 ------ hooks/common/81-install-modules-init-tools | 44 ++++++++++++++++++++ hooks/dapper/81-install-modules-init-tools | 1 + hooks/debian/80-install-kernel | 6 --- hooks/debian/81-install-modules-init-tools | 1 + hooks/edgy/80-install-kernel | 5 --- hooks/edgy/81-install-modules-init-tools | 1 + hooks/intrepid/80-install-kernel | 4 -- hooks/intrepid/81-install-modules-init-tools | 1 + hooks/karmic/80-install-kernel | 6 --- hooks/karmic/81-install-modules-init-tools | 1 + 11 files changed, 49 insertions(+), 34 deletions(-) create mode 100755 hooks/common/81-install-modules-init-tools create mode 120000 hooks/dapper/81-install-modules-init-tools create mode 120000 hooks/debian/81-install-modules-init-tools create mode 120000 hooks/edgy/81-install-modules-init-tools create mode 120000 hooks/intrepid/81-install-modules-init-tools create mode 120000 hooks/karmic/81-install-modules-init-tools diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb index 2bc87fd..0e5d4c0 100755 --- 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 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 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 85beeb2..5533f55 100755 --- 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 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 5e85126..7b047bf 100755 --- 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 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 e979715..0cbb821 100755 --- 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 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 b136b4a..4ab58c6 100755 --- 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 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