Merge gentoo/80-install-modules into common/80-install-modules-rpm

diff --git a/hooks/common/80-install-modules-rpm b/hooks/common/80-install-modules-rpm
index 11f83d586b64b7b44218f82156ac2af2572449f7..d6ea71818abf79dde0c036dcdc1047fc2c015a2a 100755 (executable)
--- a/hooks/common/80-install-modules-rpm
+++ b/hooks/common/80-install-modules-rpm
@@ -1,6 +1,11 @@
 #!/bin/sh
 #
-#  Install modules from the host system into the new image.
+#  Install modules from the host system into the new image, and
+# ensure that 'module-init-tools' is setup.
+#
+#  This is most likely required if you're using a custom kernel
+# for your Xen system.  But even if it isn't required it can't
+# really do anything bad; just waste a bit of space.
 #
 # Steve
 # --

diff --git a/hooks/gentoo/80-install-modules b/hooks/gentoo/80-install-modules
deleted file mode 100755 (executable)
index d6ea71818abf79dde0c036dcdc1047fc2c015a2a..0000000000000000000000000000000000000000
--- a/hooks/gentoo/80-install-modules
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-#  Install modules from the host system into the new image, and
-# ensure that 'module-init-tools' is setup.
-#
-#  This is most likely required if you're using a custom kernel
-# for your Xen system.  But even if it isn't required it can't
-# really do anything bad; just waste a bit of space.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-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
-
-
-#
-#  Copy the modules from the host to the new system - we should only
-# really copy the *correct* modules, but we don't know what they are.
-#
-mkdir -p ${prefix}/lib/modules
-cp -au /lib/modules/*/ ${prefix}/lib/modules
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

diff --git a/hooks/gentoo/80-install-modules b/hooks/gentoo/80-install-modules
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..12e39f008367a265878f46cfe6cc572d5e2bd955
--- /dev/null
+++ b/hooks/gentoo/80-install-modules
@@ -0,0 +1 @@
+../common/80-install-modules-rpm
\ No newline at end of file