25 files changed, 18 insertions, 40 deletions
diff --git a/examples/hooks/replace-di-banner.sh b/examples/hooks/all_binary_debian-installer-banner.sh
index 7be8682c1..7be8682c1 100755
--- a/examples/hooks/replace-di-banner.sh
+++ b/examples/hooks/all_binary_debian-installer-banner.sh
diff --git a/examples/hooks/live-helper.sh b/examples/hooks/all_binary_live-helper.sh
index c1823b303..c1823b303 100755
--- a/examples/hooks/live-helper.sh
+++ b/examples/hooks/all_binary_live-helper.sh
diff --git a/examples/hooks/hal-automount.sh b/examples/hooks/all_chroot_hal-automount.sh
index 0fec6f9da..0fec6f9da 100755
--- a/examples/hooks/hal-automount.sh
+++ b/examples/hooks/all_chroot_hal-automount.sh
diff --git a/examples/hooks/kernelpurge.sh b/examples/hooks/all_chroot_kernel-purge.sh
index 188f6a452..188f6a452 100755
--- a/examples/hooks/kernelpurge.sh
+++ b/examples/hooks/all_chroot_kernel-purge.sh
diff --git a/examples/hooks/modules.sh b/examples/hooks/all_chroot_linux-modules.sh
index 159e9bc52..159e9bc52 100755
--- a/examples/hooks/modules.sh
+++ b/examples/hooks/all_chroot_linux-modules.sh
diff --git a/examples/hooks/localepurge.sh b/examples/hooks/all_chroot_localepurge.sh
index 3fbb4c497..3fbb4c497 100755
--- a/examples/hooks/localepurge.sh
+++ b/examples/hooks/all_chroot_localepurge.sh
diff --git a/examples/hooks/losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh
index 55424383c..55424383c 100755
--- a/examples/hooks/losetup-lukshome.sh
+++ b/examples/hooks/all_chroot_losetup-lukshome.sh
diff --git a/examples/hooks/rt2570.sh b/examples/hooks/all_chroot_rt2570-modules.sh
index 408b1383f..408b1383f 100755
--- a/examples/hooks/rt2570.sh
+++ b/examples/hooks/all_chroot_rt2570-modules.sh
diff --git a/examples/hooks/sun-java6.sh b/examples/hooks/all_chroot_sun-java6.sh
index c86066fba..c86066fba 100755
--- a/examples/hooks/sun-java6.sh
+++ b/examples/hooks/all_chroot_sun-java6.sh
diff --git a/examples/hooks/update-initramfs.sh b/examples/hooks/all_chroot_update-initramfs.sh
index 5179f77e9..5179f77e9 100755
--- a/examples/hooks/update-initramfs.sh
+++ b/examples/hooks/all_chroot_update-initramfs.sh
diff --git a/examples/hooks/virtualbox-ose.sh b/examples/hooks/all_chroot_virtualbox-ose.sh
index bcf7289b5..bcf7289b5 100755
--- a/examples/hooks/virtualbox-ose.sh
+++ b/examples/hooks/all_chroot_virtualbox-ose.sh
diff --git a/examples/hooks/beryl.sh b/examples/hooks/etch_chroot_beryl.sh
index ad4cb81dd..ad4cb81dd 100755
--- a/examples/hooks/beryl.sh
+++ b/examples/hooks/etch_chroot_beryl.sh
diff --git a/examples/hooks/ipw2100.sh b/examples/hooks/etch_chroot_ipw2100-modules.sh
index e246eb251..e246eb251 100755
--- a/examples/hooks/ipw2100.sh
+++ b/examples/hooks/etch_chroot_ipw2100-modules.sh
diff --git a/examples/hooks/ipw2200.sh b/examples/hooks/etch_chroot_ipw2200-modules.sh
index 145ca8b80..145ca8b80 100755
--- a/examples/hooks/ipw2200.sh
+++ b/examples/hooks/etch_chroot_ipw2200-modules.sh
diff --git a/examples/hooks/ipw3945.sh b/examples/hooks/etch_chroot_ipw3945-modules.sh
index f805cf956..f805cf956 100755
--- a/examples/hooks/ipw3945.sh
+++ b/examples/hooks/etch_chroot_ipw3945-modules.sh
diff --git a/examples/hooks/unionfs.sh b/examples/hooks/etch_chroot_unionfs-modules.sh
index 20f088670..20f088670 100755
--- a/examples/hooks/unionfs.sh
+++ b/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
index ded8b80ed..ded8b80ed 100755
--- a/examples/hooks/live-installer_lenny-usbfix.sh
+++ b/examples/hooks/lenny_binary_live-installer-usbfix.sh
diff --git a/examples/hooks/aufs.sh b/examples/hooks/lenny_chroot_aufs-modules.sh
index e70dcc749..e70dcc749 100755
--- a/examples/hooks/aufs.sh
+++ b/examples/hooks/lenny_chroot_aufs-modules.sh
diff --git a/examples/hooks/lenny_chroot_kpdf-nodrm.sh b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
new file mode 100755
index 000000000..99fa3e9f2
--- /dev/null
+++ b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to configure KDE's PDF viewer to ignore
+# manipulation restriction on "DRM protect" PDF documents.
+#
+# To enable it, copy or symlink this hook into your config/chroot_local-hooks
+# directory.
+
+if [ -d /usr/share/config ]
+then
+	# KDE3 (etch/lenny)
+
+cat > /usr/share/config/kpdfpartrc << EOF
+[General]
+ObeyDRM=false
+EOF
+
+fi
diff --git a/examples/hooks/madwifi.sh b/examples/hooks/lenny_chroot_madwifi-modules.sh
index 0686c122b..0686c122b 100755
--- a/examples/hooks/madwifi.sh
+++ b/examples/hooks/lenny_chroot_madwifi-modules.sh
diff --git a/examples/hooks/nvidia-legacy.sh b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
index 66d67bcb5..66d67bcb5 100755
--- a/examples/hooks/nvidia-legacy.sh
+++ b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
diff --git a/examples/hooks/squashfs.sh b/examples/hooks/lenny_chroot_squashfs-modules.sh
index 20667e25b..20667e25b 100755
--- a/examples/hooks/squashfs.sh
+++ b/examples/hooks/lenny_chroot_squashfs-modules.sh
diff --git a/examples/hooks/sun-java5.sh b/examples/hooks/lenny_chroot_sun-java5.sh
index 139efd5ee..139efd5ee 100755
--- a/examples/hooks/sun-java5.sh
+++ b/examples/hooks/lenny_chroot_sun-java5.sh
diff --git a/examples/hooks/rt2x00.sh b/examples/hooks/rt2x00.sh
deleted file mode 100755
index 9da6f7272..000000000
--- 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
index 6df0490de..782133c29 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