7 files changed, 1 insertions, 198 deletions
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index 342f645eb..1c95ec88f 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # Static variables
-DISTRIBUTIONS="${DISTRIBUTIONS:-etch lenny sid}"
+DISTRIBUTIONS="${DISTRIBUTIONS:-lenny squeeze sid}"
 FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop lxde-desktop xfce-desktop}"
 SOURCE="${SOURCE:-enabled}"
 
diff --git a/examples/hooks/etch_chroot_beryl.sh b/examples/hooks/etch_chroot_beryl.sh
deleted file mode 100755
index ad4cb81dd..000000000
--- a/examples/hooks/etch_chroot_beryl.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install beryl and enable aiglx.
-# It was originally written by Inigo Tejedor Arrondo <inigo@navarrux.org>.
-#
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# For forcing aiglx activation type at boot prompt "live forceaiglx".
-# For forcing aiglx deactivation type "live noaiglx".
-
-# Importing archive signing key
-wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add -
-
-# Updating indices
-apt-get update
-
-# Installing packages
-PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-settings beryl-settings-bindings beryl-settings-simple mesa-utils"
-
-dpkg -s gnome-core > /dev/null 2>&1 && PACKAGES="${PACKAGES} emerald emerald-themes heliodor"
-dpkg -s kde-core   > /dev/null 2>&1 && PACKAGES="${PACKAGES} aquamarine"
-
-apt-get install --yes ${PACKAGES}
-
-# Adding init script
-cat > /etc/init.d/aiglx << EOF
-#!/bin/sh
-activate_3d()
-{
-	activate_aiglx
-	activate_beryl
-}
-
-activate_aiglx()
-{
-	echo "" >> /etc/X11/xorg.conf
-	echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
-	echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
-	echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
-	echo "EndSection" >> /etc/X11/xorg.conf
-
-	sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
-}
-
-activate_beryl()
-{
-	# http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-	! [ -d /etc/xdg/autostart ] && mkdir -p /etc/xdg/autostart
-
-cat > /etc/xdg/autostart/beryl-manager.desktop << EOS
-[Desktop Entry]
-Encoding=UTF-8
-Name=Beryl Manager
-GenericName=3D Window Manager
-Comment=Beryl Manager daemon
-Icon=
-Exec=beryl-starter
-Terminal=false
-Type=Application
-Categories=
-EOS
-
-cat > /usr/local/bin/beryl-starter << EOS
-#!/bin/sh
-glxinfo > /dev/null 2>&1 && beryl-manager
-EOS
-
-chmod 0755 /usr/local/bin/beryl-starter
-}
-
-if ! cat /proc/cmdline | grep noaiglx > /dev/null
-then
-	echo "Configuring xorg for aiglx..."
-	activate_3d
-fi
-EOF
-
-chmod 0755 /etc/init.d/aiglx
-update-rc.d aiglx defaults
diff --git a/examples/hooks/etch_chroot_ipw2100-modules.sh b/examples/hooks/etch_chroot_ipw2100-modules.sh
deleted file mode 100755
index e246eb251..000000000
--- a/examples/hooks/etch_chroot_ipw2100-modules.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install ipw2100 drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the contrib category. Make sure you enabled
-# it in your configuration.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-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 ipw2100 -l ${VERSION}
-done
-
-module-assistant clean ipw2100
-
-# Installing firmware (http://ipw2100.sourceforge.net/firmware.php)
-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
-tar xfvz ipw2100-fw-1.3.tgz
-mv ipw2100-1.3* /lib/firmware
-rm -f ipw2100-fw-1.3.tgz
-cd ${OLDPWD}
diff --git a/examples/hooks/etch_chroot_ipw2200-modules.sh b/examples/hooks/etch_chroot_ipw2200-modules.sh
deleted file mode 100755
index 145ca8b80..000000000
--- a/examples/hooks/etch_chroot_ipw2200-modules.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install ipw2200 drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the contrib category. Make sure you enabled
-# it in your configuration.
-
-apt-get install --yes build-essential
-
-# Building kernel mdoule
-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 ipw2200 -l ${VERSION}
-done
-
-module-assistant clean ipw2200
-
-# Installing firmware (http://ipw2200.sourceforge.net/firmware.php)
-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
-tar xfvz ipw2200-fw-3.0.tgz
-cp ipw2200-fw-3.0/*.fw /lib/firmware/
-rm -rf ipw2200-fw-3.0*
-cd ${OLDPWD}
diff --git a/examples/hooks/etch_chroot_ipw3945-modules.sh b/examples/hooks/etch_chroot_ipw3945-modules.sh
deleted file mode 100755
index f805cf956..000000000
--- a/examples/hooks/etch_chroot_ipw3945-modules.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install ipw3945 drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the contrib and non-free category. Make
-# sure you enabled it in your configuration.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-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 ipw3945 -l ${VERSION}
-done
-
-module-assistant clean 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/etch_chroot_unionfs-modules.sh b/examples/hooks/etch_chroot_unionfs-modules.sh
deleted file mode 100755
index 20f088670..000000000
--- a/examples/hooks/etch_chroot_unionfs-modules.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-helper(7) to install unionfs drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: You only want to use this hook if there is no prebuild unionfs-modules-*
-# package available for your kernel flavour.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-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 unionfs -l ${VERSION}
-done
-
-module-assistant clean unionfs
diff --git a/examples/hooks/lenny_chroot_kpdf-nodrm.sh b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
index 99fa3e9f2..bbc46b9d4 100755
--- a/examples/hooks/lenny_chroot_kpdf-nodrm.sh
+++ b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
@@ -8,7 +8,6 @@
 
 if [ -d /usr/share/config ]
 then
-	# KDE3 (etch/lenny)
 
 cat > /usr/share/config/kpdfpartrc << EOF
 [General]