[SCM] debian-live/live-helper branch, master, updated. 1.0_a43-1-1-gb7d55d1

[Daniel Baumann]

The following commit has been merged in the master branch:
commit b7d55d146b8be648b9faffcf4ef04b806b602edc
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 10 12:43:50 2008 +0200

    Updating oot example hooks to loop through all install kernel flavours.

diff --git a/examples/hooks/aufs.sh b/examples/hooks/aufs.sh
index ca637af..f0b02c6 100755
--- a/examples/hooks/aufs.sh
+++ b/examples/hooks/aufs.sh
@@ -9,5 +9,12 @@
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant --non-inter --quiet auto-install aufs
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install aufs -l ${VERSION}
+done
+
 module-assistant clean aufs
diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/ipw2100.sh
index 6fc3669..e23c932 100755
--- a/examples/hooks/ipw2100.sh
+++ b/examples/hooks/ipw2100.sh
@@ -9,7 +9,14 @@
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant --non-inter --quiet auto-install ipw2100
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install ipw2100 -l ${VERSION}
+done
+
 module-assistant clean ipw2100
 
 # Installing firmware (http://ipw2100.sourceforge.net/firmware.php)
diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/ipw2200.sh
index 47281a4..0d91fa8 100755
--- a/examples/hooks/ipw2200.sh
+++ b/examples/hooks/ipw2200.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This is a hook for live-helper(7) to install nvidia-legacy drivers
+# This is a hook for live-helper(7) to install ipw2200 drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
 #
 # Note: This hook requires packages from the contrib section. Make sure you enabled
@@ -9,7 +9,14 @@
 # Building kernel mdoule
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant --non-inter --quiet auto-install ipw2200
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install ipw2200 -l ${VERSION}
+done
+
 module-assistant clean ipw2200
 
 # Installing firmware (http://ipw2200.sourceforge.net/firmware.php)
diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/ipw3945.sh
index 18a977b..4e1ae1c 100755
--- a/examples/hooks/ipw3945.sh
+++ b/examples/hooks/ipw3945.sh
@@ -5,13 +5,18 @@
 #
 # Note: This hook requires packages from the contrib and non-free section. Make
 # sure you enabled it in your configuration.
-#
-# FIXME: it runs in interactive mode
 
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant auto-install ipw3945
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install ipw3945 -l ${VERSION}
+done
+
 module-assistant clean ipw3945
 
 # Installing additional stuff
diff --git a/examples/hooks/madwifi.sh b/examples/hooks/madwifi.sh
index 178de88..bc5d072 100755
--- a/examples/hooks/madwifi.sh
+++ b/examples/hooks/madwifi.sh
@@ -5,13 +5,18 @@
 #
 # Note: This hook requires packages from the contrib section. Make sure you enabled
 # it in your configuration.
-#
-# FIXME: it runs in interactive mode
 
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant auto-install madwifi
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install madwifi -l ${VERSION}
+done
+
 module-assistant clean madwifi
 
 # Installing additional stuff
diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/nvidia-legacy.sh
index 0dc3c6e..f4ce544 100755
--- a/examples/hooks/nvidia-legacy.sh
+++ b/examples/hooks/nvidia-legacy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This is a hook for live-helper(7) to install nvidia-legacy drivers
+# This is a hook for live-helper(7) to install nvidia-kernel-legacy drivers
 # To enable it, copy this hook into your config/chroot_localhooks directory.
 #
 # Note: This hook requires packages from the non-free section. Make sure you
@@ -9,7 +9,14 @@
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common
 module-assistant update
-module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy -l ${VERSION}
+done
+
 module-assistant clean nvidia-kernel-legacy
 
 # Installing additional stuff
diff --git a/examples/hooks/rt2570.sh b/examples/hooks/rt2570.sh
index da4d237..90c3118 100755
--- a/examples/hooks/rt2570.sh
+++ b/examples/hooks/rt2570.sh
@@ -2,10 +2,15 @@
 
 # This is a hook for live-helper(7) to install ralink rt2570 drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
-#
-# FIXME: it runs in interactive mode
 
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant auto-install rt2570-source
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install rt2570-source -l ${VERSION}
+done
+
 module-assistant clean rt2570-source
diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh
index d94b4e2..65f2ef6 100755
--- a/examples/hooks/rt2x00.sh
+++ b/examples/hooks/rt2x00.sh
@@ -8,7 +8,14 @@
 # Building kernel modules
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant auto-install rt2x00-source
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install rt2x00-source -l ${VERSION}
+done
+
 module-assistant clean rt2x00-source
 
 # Installing firmware for rt73usb
diff --git a/examples/hooks/squashfs.sh b/examples/hooks/squashfs.sh
index 5be16e6..f258f88 100755
--- a/examples/hooks/squashfs.sh
+++ b/examples/hooks/squashfs.sh
@@ -9,5 +9,12 @@
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant --non-inter --quiet auto-install squashfs
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install squashfs -l ${VERSION}
+done
+
 module-assistant clean squashfs
diff --git a/examples/hooks/unionfs.sh b/examples/hooks/unionfs.sh
index bbf210a..2cf47b3 100755
--- a/examples/hooks/unionfs.sh
+++ b/examples/hooks/unionfs.sh
@@ -9,5 +9,12 @@
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
-module-assistant --non-inter --quiet auto-install unionfs
+
+for KERNEL in /boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	module-assistant --non-inter --quiet auto-install unionfs -l ${VERSION}
+done
+
 module-assistant clean unionfs

-- 
debian-live/live-helper