Adding live-helper 1.0~a20-1.

9 files changed, 32 insertions, 61 deletions

diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/ipw2100.sh
index fc9e033..6fc3669 100755
--- a/examples/hooks/ipw2100.sh
+++ b/examples/hooks/ipw2100.sh
@@ -2,14 +2,9 @@
 
 # This is a hook for live-helper(7) to install ipw2100 drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib" sections  and the 686 flavour.
 #
-# e.g with make-live : --sections "main contrib" --kernel-flavour 686
-
-# Updating indices
-apt-get update
+# Note: This hook requires packages from the contrib section. Make sure you enabled
+# it in your configuration.
 
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant
@@ -18,7 +13,6 @@ module-assistant --non-inter --quiet auto-install ipw2100
 module-assistant clean ipw2100
 
 # Installing firmware (http://ipw2100.sourceforge.net/firmware.php)
-# grabbing 0.55 (Wed May 16 15:17:38 -- matth)
 wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz
 
 cd /tmp
diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/ipw2200.sh
index fd2fc99..47281a4 100755
--- a/examples/hooks/ipw2200.sh
+++ b/examples/hooks/ipw2200.sh
@@ -2,14 +2,9 @@
 
 # This is a hook for live-helper(7) to install nvidia-legacy drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib" sections  and the 686 flavour.
 #
-# e.g with make-live : --sections "main contrib" --kernel-flavour 686
-
-# Updating indices
-apt-get update
+# Note: This hook requires packages from the contrib section. Make sure you enabled
+# it in your configuration.
 
 # Building kernel mdoule
 which module-assistant || apt-get install --yes module-assistant
@@ -18,7 +13,6 @@ module-assistant --non-inter --quiet auto-install ipw2200
 module-assistant clean ipw2200
 
 # Installing firmware (http://ipw2200.sourceforge.net/firmware.php)
-# grabbing 3.0 (Wed May 16 15:17:38 -- matth)
 wget --referer "http://ipw2200.sourceforge.net/firmware.php" "http://ipw2200.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2200-fw-3.0.tgz" -O /tmp/ipw2200-fw-3.0.tgz
 
 cd /tmp
diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/ipw3945.sh
index 04d235b..18a977b 100755
--- a/examples/hooks/ipw3945.sh
+++ b/examples/hooks/ipw3945.sh
@@ -2,22 +2,20 @@
 
 # This is a hook for live-helper(7) to install ipw3945 drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "non-free" sections
 #
-# e.g with make-live : --sections "main non-free"
-
-# Updating indices
-apt-get update
+# 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 # interactive mode for now
+module-assistant auto-install ipw3945
 module-assistant clean ipw3945
 
-apt-get install ipw3945d firmware-ipw3945
+# Installing additional stuff
+apt-get install firmware-ipw3945 ipw3945d
 
 # hackish, autorun regulatory daemon, update-rc.d will reject that
 ln -s /etc/init.d/ipw3945d /etc/rc2.d/S19ipw3945d
diff --git a/examples/hooks/madwifi.sh b/examples/hooks/madwifi.sh
index f45b968..178de88 100755
--- a/examples/hooks/madwifi.sh
+++ b/examples/hooks/madwifi.sh
@@ -2,16 +2,11 @@
 
 # This is a hook for live-helper(7) to install madwifi drivers
 # To enable it, copy this hook into your config/chroot_localhooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "non-free" sections
 #
-# e.g with make-live : --sections "main non-free"
-
-# NOTE: it runs in interactive mode
-
-# Updating indices
-apt-get update
+# 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
@@ -19,5 +14,5 @@ module-assistant update
 module-assistant auto-install madwifi
 module-assistant clean madwifi
 
-# Installing aditional stuff
+# Installing additional stuff
 apt-get install --yes madwifi-tools madwifi-doc
diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/nvidia-legacy.sh
index cc1ceb4..0dc3c6e 100755
--- a/examples/hooks/nvidia-legacy.sh
+++ b/examples/hooks/nvidia-legacy.sh
@@ -2,14 +2,9 @@
 
 # This is a hook for live-helper(7) to install nvidia-legacy drivers
 # To enable it, copy this hook into your config/chroot_localhooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib non-free" sections.
 #
-# e.g with make-live : --sections "main contrib non-free"
-
-# Updating indices
-apt-get update
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
 
 # Building kernel module
 which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common
@@ -17,10 +12,10 @@ module-assistant update
 module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy
 module-assistant clean nvidia-kernel-legacy
 
-# Installing aditional stuff
+# Installing additional stuff
 apt-get install --yes nvidia-glx-legacy nvidia-xconfig discover
 
-# fixup (#421028)
+# Fix #421028
 if [ -f /usr/lib/xorg/modules/drivers/nvidia_drv.o ]
 then
 	cd /usr/lib/xorg/modules/drivers
diff --git a/examples/hooks/rt2570.sh b/examples/hooks/rt2570.sh
index bbf79c1..da4d237 100755
--- a/examples/hooks/rt2570.sh
+++ b/examples/hooks/rt2570.sh
@@ -2,13 +2,9 @@
 
 # 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
 
-# NOTE: it runs in interactive mode
-
-# Updating indices
-apt-get update
-
-# Building kernel module
 which module-assistant || apt-get install --yes module-assistant
 module-assistant update
 module-assistant auto-install rt2570-source
diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh
index 8c5153c..d94b4e2 100755
--- a/examples/hooks/rt2x00.sh
+++ b/examples/hooks/rt2x00.sh
@@ -2,11 +2,8 @@
 
 # This is a hook for live-helper(7) to install ralink rt2x00 drivers
 # To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# NOTE: it runs in interactive mode
-
-# Updating indices
-apt-get update
+#
+# FIXME: it runs in interactive mode
 
 # Building kernel modules
 which module-assistant || apt-get install --yes module-assistant
diff --git a/examples/hooks/sun-java5.sh b/examples/hooks/sun-java5.sh
index 987b0b2..1e18811 100755
--- a/examples/hooks/sun-java5.sh
+++ b/examples/hooks/sun-java5.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
 # This is a hook for live-helper(7) to install sun-java.
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
 #
-# To enable it, copy this hook into your config/chroot_local-hooks directory and
-# don't forget to enable non-free in LIVE_SECTIONS.
-#
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
+
 # live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
 # ask any questions while installing packages. Suns redistribution terms for
 # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
diff --git a/examples/hooks/sun-java6.sh b/examples/hooks/sun-java6.sh
index f400b4d..4cb2e06 100755
--- a/examples/hooks/sun-java6.sh
+++ b/examples/hooks/sun-java6.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
 # This is a hook for live-helper(7) to install sun-java.
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
 #
-# To enable it, copy this hook into your config/chroot_local-hooks directory and
-# don't forget to enable non-free in LIVE_SECTIONS.
-#
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
+
 # live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
 # ask any questions while installing packages. Suns redistribution terms for
 # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for