[SCM] live-helper branch, master, updated. 1.0.5-2-61-g43a6c0f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 43a6c0fd3a6291a53039d66e521f0e505128d69d
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Nov 11 17:25:50 2009 +0100

    Renaming example hooks and prefixing them with distribution name.

diff --git a/examples/hooks/replace-di-banner.sh b/examples/hooks/all_binary_debian-installer-banner.sh
similarity index 100%
rename from examples/hooks/replace-di-banner.sh
rename to examples/hooks/all_binary_debian-installer-banner.sh
diff --git a/examples/hooks/live-helper.sh b/examples/hooks/all_binary_live-helper.sh
similarity index 100%
rename from examples/hooks/live-helper.sh
rename to examples/hooks/all_binary_live-helper.sh
diff --git a/examples/hooks/hal-automount.sh b/examples/hooks/all_chroot_hal-automount.sh
similarity index 100%
rename from examples/hooks/hal-automount.sh
rename to examples/hooks/all_chroot_hal-automount.sh
diff --git a/examples/hooks/kernelpurge.sh b/examples/hooks/all_chroot_kernel-purge.sh
similarity index 100%
rename from examples/hooks/kernelpurge.sh
rename to examples/hooks/all_chroot_kernel-purge.sh
diff --git a/examples/hooks/modules.sh b/examples/hooks/all_chroot_linux-modules.sh
similarity index 100%
rename from examples/hooks/modules.sh
rename to examples/hooks/all_chroot_linux-modules.sh
diff --git a/examples/hooks/localepurge.sh b/examples/hooks/all_chroot_localepurge.sh
similarity index 100%
rename from examples/hooks/localepurge.sh
rename to examples/hooks/all_chroot_localepurge.sh
diff --git a/examples/hooks/losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh
similarity index 100%
rename from examples/hooks/losetup-lukshome.sh
rename to examples/hooks/all_chroot_losetup-lukshome.sh
diff --git a/examples/hooks/rt2570.sh b/examples/hooks/all_chroot_rt2570-modules.sh
similarity index 100%
rename from examples/hooks/rt2570.sh
rename to examples/hooks/all_chroot_rt2570-modules.sh
diff --git a/examples/hooks/sun-java6.sh b/examples/hooks/all_chroot_sun-java6.sh
similarity index 100%
rename from examples/hooks/sun-java6.sh
rename to examples/hooks/all_chroot_sun-java6.sh
diff --git a/examples/hooks/update-initramfs.sh b/examples/hooks/all_chroot_update-initramfs.sh
similarity index 100%
rename from examples/hooks/update-initramfs.sh
rename to examples/hooks/all_chroot_update-initramfs.sh
diff --git a/examples/hooks/virtualbox-ose.sh b/examples/hooks/all_chroot_virtualbox-ose.sh
similarity index 100%
rename from examples/hooks/virtualbox-ose.sh
rename to examples/hooks/all_chroot_virtualbox-ose.sh
diff --git a/examples/hooks/beryl.sh b/examples/hooks/etch_chroot_beryl.sh
similarity index 100%
rename from examples/hooks/beryl.sh
rename to examples/hooks/etch_chroot_beryl.sh
diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/etch_chroot_ipw2100-modules.sh
similarity index 100%
rename from examples/hooks/ipw2100.sh
rename to examples/hooks/etch_chroot_ipw2100-modules.sh
diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/etch_chroot_ipw2200-modules.sh
similarity index 100%
rename from examples/hooks/ipw2200.sh
rename to examples/hooks/etch_chroot_ipw2200-modules.sh
diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/etch_chroot_ipw3945-modules.sh
similarity index 100%
rename from examples/hooks/ipw3945.sh
rename to examples/hooks/etch_chroot_ipw3945-modules.sh
diff --git a/examples/hooks/unionfs.sh b/examples/hooks/etch_chroot_unionfs-modules.sh
similarity index 100%
rename from examples/hooks/unionfs.sh
rename to examples/hooks/etch_chroot_unionfs-modules.sh
diff --git a/examples/hooks/live-installer_lenny-usbfix.sh b/examples/hooks/lenny_binary_live-installer-usbfix.sh
similarity index 100%
rename from examples/hooks/live-installer_lenny-usbfix.sh
rename to examples/hooks/lenny_binary_live-installer-usbfix.sh
diff --git a/examples/hooks/aufs.sh b/examples/hooks/lenny_chroot_aufs-modules.sh
similarity index 100%
rename from examples/hooks/aufs.sh
rename to examples/hooks/lenny_chroot_aufs-modules.sh
diff --git a/examples/hooks/kde-no-pdf-drm.sh b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
similarity index 66%
copy from examples/hooks/kde-no-pdf-drm.sh
copy to examples/hooks/lenny_chroot_kpdf-nodrm.sh
index 6df0490..99fa3e9 100755
--- a/examples/hooks/kde-no-pdf-drm.sh
+++ b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
@@ -6,16 +6,7 @@
 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
 # directory.
 
-if [ -d /usr/share/kde4/config ]
-then
-	# KDE4 (squeeze/sid)
-
-cat > /usr/share/kde4/config/okularpartrc << EOF
-[General]
-ObeyDRM=false
-EOF
-
-elif [ -d /usr/share/config ]
+if [ -d /usr/share/config ]
 then
 	# KDE3 (etch/lenny)
 
diff --git a/examples/hooks/madwifi.sh b/examples/hooks/lenny_chroot_madwifi-modules.sh
similarity index 100%
rename from examples/hooks/madwifi.sh
rename to examples/hooks/lenny_chroot_madwifi-modules.sh
diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
similarity index 100%
rename from examples/hooks/nvidia-legacy.sh
rename to examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
diff --git a/examples/hooks/squashfs.sh b/examples/hooks/lenny_chroot_squashfs-modules.sh
similarity index 100%
rename from examples/hooks/squashfs.sh
rename to examples/hooks/lenny_chroot_squashfs-modules.sh
diff --git a/examples/hooks/sun-java5.sh b/examples/hooks/lenny_chroot_sun-java5.sh
similarity index 100%
rename from examples/hooks/sun-java5.sh
rename to examples/hooks/lenny_chroot_sun-java5.sh
diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh
deleted file mode 100755
index 9da6f72..0000000
--- a/examples/hooks/rt2x00.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install ralink rt2x00 drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# FIXME: it runs in interactive mode
-
-apt-get install --yes build-essential
-
-# Building kernel modules
-which module-assistant || apt-get install --yes module-assistant
-module-assistant update
-
-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
-wget "http://www.ralinktech.com.tw/data/RT73_Linux_STA_Drv1.0.4.0.tar.gz" -O /tmp/RT73_Linux_STA_Drv1.0.4.0.tar.gz
-
-cd /tmp
-tar xfvz RT73_Linux_STA_Drv1.0.4.0.tar.gz
-cp RT73_Linux_STA_Drv1.0.4.0/Module/rt73.bin /lib/firmware
-rm -rf RT73_Linux_STA_Drv*
-cd ${OLDPWD}
diff --git a/examples/hooks/kde-no-pdf-drm.sh b/examples/hooks/squeeze_chroot_okular-nodrm.sh
similarity index 74%
rename from examples/hooks/kde-no-pdf-drm.sh
rename to examples/hooks/squeeze_chroot_okular-nodrm.sh
index 6df0490..782133c 100755
--- a/examples/hooks/kde-no-pdf-drm.sh
+++ b/examples/hooks/squeeze_chroot_okular-nodrm.sh
@@ -15,13 +15,4 @@ cat > /usr/share/kde4/config/okularpartrc << EOF
 ObeyDRM=false
 EOF
 
-elif [ -d /usr/share/config ]
-then
-	# KDE3 (etch/lenny)
-
-cat > /usr/share/config/kpdfpartrc << EOF
-[General]
-ObeyDRM=false
-EOF
-
 fi

-- 
live-helper