[SCM] debian-live/config-daniel branch, master, updated. 52907e97fb3c8c94ec4b1d67c64ad395fbd71010

Daniel Baumann daniel at debian.org
Mon Jan 26 03:10:32 UTC 2009


The following commit has been merged in the master branch:
commit 52907e97fb3c8c94ec4b1d67c64ad395fbd71010
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jan 26 04:10:22 2009 +0100

    Replacing old configs with new one.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e0e99bd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+binary
+binary.img
+binary.iso
+binary.list
+binary.packages
+
+cache
+
+chroot/
+
+config/binary
+config/bootstrap
+config/chroot
+config/common
+config/source
+
+.stage
+
+source
+source.img
+source.iso
+source.list
+source.packages
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..04891e0
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+lh_build | tee build.log
diff --git a/clean.sh b/clean.sh
new file mode 100755
index 0000000..707249d
--- /dev/null
+++ b/clean.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+lh_clean
+
+rm -f config/binary config/bootstrap config/chroot config/common config/source
+
+rm -f build.log
+
+if ls config/*/ > /dev/null 2>&1
+then
+	rmdir --ignore-fail-on-non-empty config/*/
+fi
+
+if [ -d config ]
+then
+	rmdir --ignore-fail-on-non-empty config
+fi
diff --git a/config.sh b/config.sh
new file mode 100755
index 0000000..c4830b1
--- /dev/null
+++ b/config.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ "$(basename $(echo ${HOSTNAME} | sed -e 's|\.|/|g'))" = "localhost" ]
+then
+	MIRROR_DEBIAN="http://mirror/ftp.debian.org/debian"
+	MIRROR_SECURITY="http://mirror/ftp.debian.org/debian-security/"
+else
+	MIRROR_DEBIAN="http://ftp.ch.debian.org/debian/"
+	MIRROR_SECURITY="http://ftp.ch.debian.org/debian-security/"
+fi
+
+lh_config \
+	--apt-recommends disabled \
+	--debian-installer live \
+	--debian-installer-distribution lenny \
+	--categories "main contrib non-free" \
+	--distribution lenny \
+	--linux-flavours 686 \
+	--mirror-bootstrap ${MIRROR_DEBIAN} \
+	--mirror-chroot ${MIRROR_DEBIAN} \
+	--mirror-chroot-security ${MIRROR_SECURITY} \
+	--mirror-binary ${MIRROR_DEBIAN} \
+	--mirror-binary-security ${MIRROR_SECURITY} \
+	--packages-lists "standard debian-custom debian-live debian-restricted" \
+	${@}
diff --git a/config/chroot_local-packageslists/debian-custom b/config/chroot_local-packageslists/debian-custom
new file mode 100644
index 0000000..80606b0
--- /dev/null
+++ b/config/chroot_local-packageslists/debian-custom
@@ -0,0 +1,53 @@
+## Debian Custom packages
+## http://custom.debian.net/
+
+## Archive Signing Key
+debian-unofficial-archive-keyring
+
+## Packages
+#archive-helper
+#git-backup
+#git-backup-client
+#git-backup-server
+#nagios-images-custom
+#nagios-plugins-custom
+#preseed-apache2
+preseed-apt
+#preseed-apt-utils
+preseed-base-files
+preseed-bash-completion
+preseed-dhcp3-client
+#preseed-gdm
+#preseed-git-core
+#preseed-git-daemon-run
+#preseed-gitweb
+#preseed-gnome-applets
+#preseed-grub
+#preseed-initscripts
+preseed-kbd
+preseed-module-init-tools
+#preseed-mr
+#preseed-munin
+#preseed-munin-node
+#preseed-nagios3-common
+#preseed-nagios-nrpe-server
+#preseed-nagios-plugins-basic
+#preseed-ntpdate
+#preseed-openssh-client
+#preseed-openssh-server
+#preseed-procps
+preseed-readline-common
+#preseed-rsync
+#preseed-sane
+#preseed-sane-utils
+#preseed-sbuild
+preseed-screen
+preseed-sudo
+#preseed-tpb
+preseed-vim
+#preseed-xen-utils
+#preseed-xterm
+shell-helper
+shell-utils
+#virtualbox-kiosk
+#xenstrap
diff --git a/config/chroot_local-packageslists/debian-live b/config/chroot_local-packageslists/debian-live
new file mode 100644
index 0000000..a8821eb
--- /dev/null
+++ b/config/chroot_local-packageslists/debian-live
@@ -0,0 +1,14 @@
+## Debian Live packages
+## http://live.debian.net/
+
+## Archive Signing Key
+#debian-unofficial-archive-keyring
+
+## Packages
+#live-helper
+#live-initramfs
+#live-initscripts
+#live-magic
+#live-manual
+#live-startscripts
+#live-webhelper
diff --git a/config/chroot_local-packageslists/debian-restricted b/config/chroot_local-packageslists/debian-restricted
new file mode 100644
index 0000000..0877d4d
--- /dev/null
+++ b/config/chroot_local-packageslists/debian-restricted
@@ -0,0 +1,22 @@
+## Debian Restricted packages
+## http://restricted.debian.net/
+
+## Archive Signing Key
+#debian-unofficial-archive-keyring
+
+## Packages
+#if ARCHITECTURE amd64 i386
+#flash-player
+#endif
+#hot-babe
+#lame
+#libdvdcss2
+#libmp3lame0
+#if ARCHITECTURE amd64 i386 powerpc
+#mplayer-codecs
+#opera
+#endif
+#revoco
+#if ARCHITECTURE i386
+#skype
+#endif
diff --git a/config/chroot_local-preseed/nagios-plugins-custom.preseed b/config/chroot_local-preseed/nagios-plugins-custom.preseed
new file mode 100644
index 0000000..8cc053b
--- /dev/null
+++ b/config/chroot_local-preseed/nagios-plugins-custom.preseed
@@ -0,0 +1,29 @@
+################################################################################
+## nagios-plugins-custom
+
+#nagios-plugins-custom nagios-plugins-custom/preseed boolean false
+
+#nagios-plugins-custom nagios-plugins-custom/mirrors multiselect debian, security, volatile, cd, cdimage, backports, multimedia
+#nagios-plugins-custom nagios-plugins-custom/mirror-threshold
+#nagios-plugins-custom nagios-plugins-custom/debian-source string http://ftp.debian.org/debian/
+#nagios-plugins-custom nagios-plugins-custom/debian-target string /srv/mirror/debian/
+#nagios-plugins-custom nagios-plugins-custom/debian-trace string project/trace/ftp-master.debian.org
+#nagios-plugins-custom nagios-plugins-custom/security-source string http://security.debian.org/
+#nagios-plugins-custom nagios-plugins-custom/security-target string /srv/mirror/debian-security/
+#nagios-plugins-custom nagios-plugins-custom/security-trace string project/trace/security-master.debian.org
+#nagios-plugins-custom nagios-plugins-custom/volatile-source string http://volatile.debian.org/debian-volatile/
+#nagios-plugins-custom nagios-plugins-custom/volatile-target string /srv/mirror/debian-volatile/
+#nagios-plugins-custom nagios-plugins-custom/volatile-trace string project/trace/volatile-master.debian.org
+#nagios-plugins-custom nagios-plugins-custom/cd-source string http://cdimage.debian.org/cdimage/release/
+#nagios-plugins-custom nagios-plugins-custom/cd-target string /srv/mirror/debian-cd/
+#nagios-plugins-custom nagios-plugins-custom/cd-trace string project/trace/cdimage.debian.org
+#nagios-plugins-custom nagios-plugins-custom/cdimage-source string http://cdimage.debian.org/cdimage/
+#nagios-plugins-custom nagios-plugins-custom/cdimage-target string /srv/mirror/debian-cdimage/
+#nagios-plugins-custom nagios-plugins-custom/cdimage-trace string daily-builds/daily-trace
+#nagios-plugins-custom nagios-plugins-custom/backports-source string http://www.backports.org/debian/
+#nagios-plugins-custom nagios-plugins-custom/backports-target string /srv/mirror/backports.org/
+#nagios-plugins-custom nagios-plugins-custom/backports-trace string project/trace/www.backports.org
+#nagios-plugins-custom nagios-plugins-custom/multimedia-source string http://www.debian-multimedia.org/
+#nagios-plugins-custom nagios-plugins-custom/multimedia-target string /srv/mirror/debian-multimedia.org/
+#nagios-plugins-custom nagios-plugins-custom/multimedia-trace string project/trace/marillat.net
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-apache2.preseed b/config/chroot_local-preseed/preseed-apache2.preseed
new file mode 100644
index 0000000..daea7b4
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-apache2.preseed
@@ -0,0 +1,11 @@
+################################################################################
+## preseed-apache2
+
+#preseed-apache2 preseed-apache2/preseed boolean false
+
+#preseed-apache2 preseed-apache2/server-signature select On
+#preseed-apache2 preseed-apache2/server-tokens select Full
+#preseed-apache2 preseed-apache2/listen string 80
+#preseed-apache2 preseed-apache2/mods multiselect
+#preseed-apache2 preseed-apache2/sites string
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-apt.preseed b/config/chroot_local-preseed/preseed-apt.preseed
new file mode 100644
index 0000000..5f9f5c4
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-apt.preseed
@@ -0,0 +1,28 @@
+################################################################################
+## preseed-apt
+
+#preseed-apt preseed-apt/preseed boolean false
+preseed-apt preseed-apt/preseed boolean true
+
+#preseed-apt preseed-apt/acquire-pdiffs boolean true
+preseed-apt preseed-apt/acquire-pdiffs boolean disabled
+#preseed-apt preseed-apt/apt-acquire-translation string en_US
+preseed-apt preseed-apt/apt-acquire-translation string C
+#preseed-apt preseed-apt/apt-authentication-trustcdrom boolean true
+preseed-apt preseed-apt/apt-authentication-trustcdrom boolean false
+#preseed-apt preseed-apt/apt-clean-installed boolean false
+preseed-apt preseed-apt/apt-clean-installed boolean true
+#preseed-apt preseed-apt/apt-get-allow-unauthenticated boolean false
+#preseed-apt preseed-apt/apt-get-automatic-remove boolean false
+#preseed-apt preseed-apt/apt-get-hide-auto-remove boolean false
+#preseed-apt preseed-apt/apt-get-purge boolean false
+preseed-apt preseed-apt/apt-get-purge boolean true
+#preseed-apt preseed-apt/apt-get-show-upgraded boolean false
+preseed-apt preseed-apt/apt-get-show-upgraded boolean true
+#preseed-apt preseed-apt/apt-install-recommends boolean true
+preseed-apt preseed-apt/apt-install-recommends boolean false
+#preseed-apt preseed-apt/apt-install-suggests boolean false
+#preseed-apt preseed-apt/aptitude-recommends-important boolean true
+preseed-apt preseed-apt/aptitude-recommends-important boolean false
+#preseed-apt preseed-apt/aptitude-suggests-important boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-base-files-xen-domu.preseed b/config/chroot_local-preseed/preseed-base-files-xen-domu.preseed
new file mode 100644
index 0000000..35e61bc
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-base-files-xen-domu.preseed
@@ -0,0 +1,12 @@
+################################################################################
+## preseed-base-files-xen-domu
+
+
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/preseed boolean false
+
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/hostname string debian
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/address string 192.168.0.100
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/broadcast string 192.168.0.255
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/gateway string 192.168.0.1
+#preseed-base-files-xen-domu preseed-base-files-xen-domu/netmask string 255.255.255.0
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-base-files.preseed b/config/chroot_local-preseed/preseed-base-files.preseed
new file mode 100644
index 0000000..8b418ca
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-base-files.preseed
@@ -0,0 +1,12 @@
+################################################################################
+## preseed-base-files
+
+#preseed-base-files preseed-base-files/preseed boolean false
+preseed-base-files preseed-base-files/preseed boolean true
+
+#preseed-base-files preseed-base-files/color-user-prompt select no color
+#preseed-base-files preseed-base-files/color-root-prompt select no color
+preseed-base-files preseed-base-files/color-root-prompt select light red
+#preseed-base-files preseed-base-files/host-prompt select hostname
+preseed-base-files preseed-base-files/host-prompt select debian
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-bash-completion.preseed b/config/chroot_local-preseed/preseed-bash-completion.preseed
new file mode 100644
index 0000000..bd5897b
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-bash-completion.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-bash-completion
+
+#preseed-bash-completion preseed-bash-completion/preseed boolean false
+preseed-bash-completion preseed-bash-completion/preseed boolean true
+
+#preseed-bash-completion preseed-bash-completion/enable boolean false
+preseed-bash-completion preseed-bash-completion/enable boolean true
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-dhcp3-client.preseed b/config/chroot_local-preseed/preseed-dhcp3-client.preseed
new file mode 100644
index 0000000..7238bcc
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-dhcp3-client.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-dhcp3-client
+
+#preseed-dhcp3-client preseed-dhcp3-client/preseed boolean false
+preseed-dhcp3-client preseed-dhcp3-client/preseed boolean true
+
+#preseed-dhcp3-client preseed-dhcp3-client/send-host-name boolean false
+preseed-dhcp3-client preseed-dhcp3-client/send-host-name boolean true
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-gdm.preseed b/config/chroot_local-preseed/preseed-gdm.preseed
new file mode 100644
index 0000000..4aebced
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-gdm.preseed
@@ -0,0 +1,11 @@
+################################################################################
+## preseed-gdm
+
+#preseed-gdm preseed-gdm/preseed boolean false
+
+#preseed-gdm preseed-gdm/double-login-warning boolean false
+#preseed-gdm preseed-gdm/always-login-current-session boolean false
+#preseed-gdm preseed-gdm/display-last-login boolean false
+#preseed-gdm preseed-gdm/console-notify boolean false
+#preseed-gdm preseed-gdm/allow-root boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-git-core.preseed b/config/chroot_local-preseed/preseed-git-core.preseed
new file mode 100644
index 0000000..6f83a63
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-git-core.preseed
@@ -0,0 +1,12 @@
+################################################################################
+## preseed-git-core
+
+#preseed-git-core preseed-git-core/preseed boolean false
+
+#preseed-git-core preseed-git-core/branch-autosetupmerge select auto
+#preseed-git-core preseed-git-core/color-branch select false
+#preseed-git-core preseed-git-core/color-diff select false
+#preseed-git-core preseed-git-core/color-interactive select false
+#preseed-git-core preseed-git-core/color-pager boolean true
+#preseed-git-core preseed-git-core/color-status select false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-gitweb.preseed b/config/chroot_local-preseed/preseed-gitweb.preseed
new file mode 100644
index 0000000..536ee62
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-gitweb.preseed
@@ -0,0 +1,17 @@
+################################################################################
+## preseed-gitweb
+
+
+#preseed-gitweb preseed-gitweb/preseed boolean false
+
+#preseed-gitweb preseed-gitweb/favicon string /git-favicon.png
+#preseed-gitweb preseed-gitweb/git-base-url-list string "git://git.example.com/git", "http://git.example.com/git", "gitosis\@git.example.com:"
+#preseed-gitweb preseed-gitweb/git-temp string /tmp
+#preseed-gitweb preseed-gitweb/home-link string /
+#preseed-gitweb preseed-gitweb/home-link-str string git.example.com
+#preseed-gitweb preseed-gitweb/home-text string indextext.html
+#preseed-gitweb preseed-gitweb/logo string /git-logo.png
+#preseed-gitweb preseed-gitweb/projectroot string /srv/gitosis/repositories
+#preseed-gitweb preseed-gitweb/projects-list string /srv/gitosis/gitosis/projects.list
+#preseed-gitweb preseed-gitweb/stylesheet string /gitweb.css
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-gnome-applets.preseed b/config/chroot_local-preseed/preseed-gnome-applets.preseed
new file mode 100644
index 0000000..63d5713
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-gnome-applets.preseed
@@ -0,0 +1,7 @@
+################################################################################
+## preseed-gnome-applets
+
+#preseed-gnome-applets preseed-gnome-applets/preseed boolean false
+
+#preseed-gnome-applets preseed-gnome-applets/cpufreq-selector-suid boolean no
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-grub.preseed b/config/chroot_local-preseed/preseed-grub.preseed
new file mode 100644
index 0000000..51c1b20
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-grub.preseed
@@ -0,0 +1,10 @@
+################################################################################
+## preseed-grub
+
+#preseed-grub preseed-grub/preseed boolean false
+
+#preseed-grub preseed-grub/color string cyan/blue white/blue
+#preseed-grub preseed-grub/default string 0
+#preseed-grub preseed-grub/defoptions string
+#preseed-grub preseed-grub/timeout string 5
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-initscripts.preseed b/config/chroot_local-preseed/preseed-initscripts.preseed
new file mode 100644
index 0000000..a1f1833
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-initscripts.preseed
@@ -0,0 +1,15 @@
+################################################################################
+## preseed-initscripts
+
+#preseed-initscripts preseed-initscripts/preseed boolean false
+
+#preseed-initscripts preseed-initscripts/asyncmountnfs boolean true
+#preseed-initscripts preseed-initscripts/delaylogin boolean false
+#preseed-initscripts preseed-initscripts/fsckfix boolean false
+#preseed-initscripts preseed-initscripts/ramlock boolean false
+#preseed-initscripts preseed-initscripts/ramrun boolean false
+#preseed-initscripts preseed-initscripts/sulogin boolean false
+#preseed-initscripts preseed-initscripts/tmptime string 0
+#preseed-initscripts preseed-initscripts/utc boolean true
+#preseed-initscripts preseed-initscripts/verbose boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-kbd.preseed b/config/chroot_local-preseed/preseed-kbd.preseed
new file mode 100644
index 0000000..a0a3598
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-kbd.preseed
@@ -0,0 +1,12 @@
+################################################################################
+## preseed-kbd
+
+#preseed-kbd preseed-kbd/preseed boolean false
+preseed-kbd preseed-kbd/preseed boolean true
+
+#preseed-kbd preseed-kbd/blank-time string 30
+preseed-kbd preseed-kbd/blank-time string 5
+#preseed-kbd preseed-kbd/leds multiselect
+#preseed-kbd preseed-kbd/powerdown-time string 30
+preseed-kbd preseed-kbd/powerdown-time string 15
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-module-init-tools.preseed b/config/chroot_local-preseed/preseed-module-init-tools.preseed
new file mode 100644
index 0000000..3164815
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-module-init-tools.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-module-init-tools
+
+#preseed-module-init-tools preseed-module-init-tools/preseed boolean false
+preseed-module-init-tools preseed-module-init-tools/preseed boolean true
+
+#preseed-module-init-tools preseed-module-init-tools/blacklist string
+preseed-module-init-tools preseed-module-init-tools/blacklist string pcspkr
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-mr.preseed b/config/chroot_local-preseed/preseed-mr.preseed
new file mode 100644
index 0000000..71fea0e
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-mr.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-mr
+
+#preseed-mr preseed-mr/preseed boolean false
+
+#preseed-mr preseed-mr/user string daniel
+#preseed-mr preseed-mr/home string /home/daniel
+#preseed-mr preseed-mr/directory string /srv/repo
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-munin-node.preseed b/config/chroot_local-preseed/preseed-munin-node.preseed
new file mode 100644
index 0000000..40ce547
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-munin-node.preseed
@@ -0,0 +1,8 @@
+################################################################################
+## preseed-munin-node
+
+
+#preseed-munin-node preseed-munin-node/preseed boolean false
+
+#preseed-munin-node preseed-munin-node/allow string 127.0.0.1
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-munin.preseed b/config/chroot_local-preseed/preseed-munin.preseed
new file mode 100644
index 0000000..7210adf
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-munin.preseed
@@ -0,0 +1,11 @@
+################################################################################
+## preseed-munin
+
+#preseed-munin preseed-munin/preseed boolean false
+
+#preseed-munin preseed-munin/guest-account boolean false
+#preseed-munin preseed-munin/guest-username string munin-guest
+#preseed-munin preseed-munin/guest-password password
+#preseed-munin preseed-munin/guest-password-again password
+
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-nagios-nrpe-server.preseed b/config/chroot_local-preseed/preseed-nagios-nrpe-server.preseed
new file mode 100644
index 0000000..0ebb77a
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-nagios-nrpe-server.preseed
@@ -0,0 +1,24 @@
+################################################################################
+## preseed-nagios-nrpe-server
+
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/preseed boolean false
+
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/pid-file
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/server-port
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/server-address
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/nrpe-group
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/allowed-hosts string 127.0.0.1
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/dont-blame-nrpe boolean false
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-prefix
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/debug
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-timeout
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/connection-timeout
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/allow-weak-random-seed
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/include
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-users
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-load
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-disk
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-zombie-procs
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-total-procs
+#preseed-nagios-nrpe-server preseed-nagios-nrpe-server/command-check-all-disks string -w 20 -c 10 -p /
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-nagios-plugins-basic.preseed b/config/chroot_local-preseed/preseed-nagios-plugins-basic.preseed
new file mode 100644
index 0000000..eb25c1f
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-nagios-plugins-basic.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-nagios-plugins-basic
+
+#preseed-nagios-plugins-basic preseed-nagios-plugins-basic/preseed boolean false
+
+#preseed-nagios-plugins-basic preseed-nagios-plugins-basic/suid-check-dhcp boolean false
+#preseed-nagios-plugins-basic preseed-nagios-plugins-basic/suid-check-icmp boolean false
+#preseed-nagios-plugins-basic preseed-nagios-plugins-basic/suid-check-ide-smart boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-nagios3-common.preseed b/config/chroot_local-preseed/preseed-nagios3-common.preseed
new file mode 100644
index 0000000..ba66a11
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-nagios3-common.preseed
@@ -0,0 +1,24 @@
+################################################################################
+## preseed-nagios3-common
+
+#preseed-nagios3-common preseed-nagios3-common/preseed boolean false
+
+#preseed-nagios3-common preseed-nagios3-common/use-authentication boolean true
+#preseed-nagios3-common preseed-nagios3-common/default-user-name string
+#preseed-nagios3-common preseed-nagios3-common/authorized-for-system-information string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_configuration_information string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_system_commands string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_all_services string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_all_hosts string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_all_service_commands string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/authorized_for_all_host_commands string nagiosadmin
+#preseed-nagios3-common preseed-nagios3-common/external-commands boolean false
+#preseed-nagios3-common preseed-nagios3-common/process-performance-data boolean false
+#preseed-nagios3-common preseed-nagios3-common/service-perfdata-command string
+#preseed-nagios3-common preseed-nagios3-common/enable-flap-detection boolean true
+#preseed-nagios3-common preseed-nagios3-common/guest-account boolean false
+#preseed-nagios3-common preseed-nagios3-common/guest-username string nagios-guest
+#preseed-nagios3-common preseed-nagios3-common/guest-password password
+#preseed-nagios3-common preseed-nagios3-common/guest-password-again password
+
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-ntpdate.preseed b/config/chroot_local-preseed/preseed-ntpdate.preseed
new file mode 100644
index 0000000..82a49a2
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-ntpdate.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-ntpdate
+
+#preseed-ntpdate preseed-ntpdate/preseed boolean false
+
+#preseed-ntpdate preseed-ntpdate/ntpdate-use-ntp-conf boolean yes
+#preseed-ntpdate preseed-ntpdate/ntpservers string 0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org
+#preseed-ntpdate preseed-ntpdate/ntpoptions string
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-openssh-client.preseed b/config/chroot_local-preseed/preseed-openssh-client.preseed
new file mode 100644
index 0000000..49b2b03
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-openssh-client.preseed
@@ -0,0 +1,12 @@
+################################################################################
+## preseed-openssh-client
+
+#preseed-openssh-client preseed-openssh-client/preseed boolean false
+
+#preseed-openssh-client preseed-openssh-client/user string daniel
+#preseed-openssh-client preseed-openssh-client/home string /home/daniel
+#preseed-openssh-client preseed-openssh-client/directory
+#preseed-openssh-client preseed-openssh-client/control-path string ~/.ssh/socket/%r@%h:%p
+#preseed-openssh-client preseed-openssh-client/control-master select no
+#preseed-openssh-client preseed-openssh-client/strict-host-key-checking select ask
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-openssh-server.preseed b/config/chroot_local-preseed/preseed-openssh-server.preseed
new file mode 100644
index 0000000..777ba8d
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-openssh-server.preseed
@@ -0,0 +1,15 @@
+################################################################################
+## preseed-openssh-server
+
+
+#preseed-openssh-server preseed-openssh-server/preseed boolean false
+
+#preseed-openssh-server preseed-openssh-server/password-authentication boolean true
+#preseed-openssh-server preseed-openssh-server/permit-root-login select true
+#preseed-openssh-server preseed-openssh-server/banner boolean false
+#preseed-openssh-server preseed-openssh-server/use-pam boolean true
+#preseed-openssh-server preseed-openssh-server/permit-tunnel select yes
+#preseed-openssh-server preseed-openssh-server/use-host-dsa-key boolean true
+#preseed-openssh-server preseed-openssh-server/use-host-rsa-key boolean true
+#preseed-openssh-server preseed-openssh-server/ignore-user-knownhosts boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-procps.preseed b/config/chroot_local-preseed/preseed-procps.preseed
new file mode 100644
index 0000000..3f7c11e
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-procps.preseed
@@ -0,0 +1,23 @@
+################################################################################
+## preseed-procps
+
+#preseed-procps preseed-procps/preseed boolean false
+
+#preseed-procps preseed-procps/kernel-domainname string (none)
+#preseed-procps preseed-procps/kernel-printk string 7 4 1 7
+#preseed-procps preseed-procps/net-ipv4-conf-default-rp-filter boolean false
+#preseed-procps preseed-procps/net-ipv4-conf-all-rp-filter boolean false
+#preseed-procps preseed-procps/net-ipv4-tcp-syncookies boolean false
+#preseed-procps preseed-procps/net-ipv4-ip-forward boolean false
+#preseed-procps preseed-procps/net-ipv6-conf-all-forwarding boolean false
+#preseed-procps preseed-procps/net-ipv4-icmp-echo-ignore-broadcasts boolean true
+#preseed-procps preseed-procps/net-ipv4-icmp-ignore-bogus-error-responses boolean true
+#preseed-procps preseed-procps/net-ipv4-conf-all-accept-redirects boolean true
+#preseed-procps preseed-procps/net-ipv6-conf-all-accept-redirects boolean true
+#preseed-procps preseed-procps/net-ipv4-conf-all-secure-redirects boolean true
+#preseed-procps preseed-procps/net-ipv4-conf-all-send-redirects boolean true
+#preseed-procps preseed-procps/net-ipv4-conf-all-accept-source-route boolean false
+#preseed-procps preseed-procps/net-ipv6-conf-all-accept-source-route boolean false
+#preseed-procps preseed-procps/net-ipv4-conf-all-log-martians boolean false
+#preseed-procps preseed-procps/sys-kernel-maps-protect boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-readline-common.preseed b/config/chroot_local-preseed/preseed-readline-common.preseed
new file mode 100644
index 0000000..c929896
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-readline-common.preseed
@@ -0,0 +1,9 @@
+################################################################################
+## preseed-readline-common
+
+#preseed-readline-common preseed-readline-common/preseed boolean false
+preseed-readline-common preseed-readline-common/preseed boolean true
+
+#preseed-readline-common preseed-readline-common/bell-style select audible
+preseed-readline-common preseed-readline-common/bell-style select none
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync-127011-systems.preseed b/config/chroot_local-preseed/preseed-rsync-127011-systems.preseed
new file mode 100644
index 0000000..5ca2ab6
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync-127011-systems.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync-127011-systems
+
+#preseed-rsync-127011-systems preseed-rsync-127011-systems/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync-debian-custom.preseed b/config/chroot_local-preseed/preseed-rsync-debian-custom.preseed
new file mode 100644
index 0000000..c1f57ce
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync-debian-custom.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync-debian-custom
+
+#preseed-rsync-debian-custom preseed-rsync-debian-custom/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync-debian-daniel.preseed b/config/chroot_local-preseed/preseed-rsync-debian-daniel.preseed
new file mode 100644
index 0000000..2527c9b
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync-debian-daniel.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync-debian-daniel
+
+#preseed-rsync-debian-daniel preseed-rsync-debian-daniel/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync-debian-git.preseed b/config/chroot_local-preseed/preseed-rsync-debian-git.preseed
new file mode 100644
index 0000000..ecf853b
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync-debian-git.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync-debian-git
+
+#preseed-rsync-debian-git preseed-rsync-debian-git/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync-debian-live.preseed b/config/chroot_local-preseed/preseed-rsync-debian-live.preseed
new file mode 100644
index 0000000..9a7bab2
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync-debian-live.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync-debian-live
+
+#preseed-rsync-debian-live preseed-rsync-debian-live/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-rsync.preseed b/config/chroot_local-preseed/preseed-rsync.preseed
new file mode 100644
index 0000000..bc32f4a
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-rsync.preseed
@@ -0,0 +1,5 @@
+################################################################################
+## preseed-rsync
+
+#preseed-rsync preseed-rsync/preseed boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-sane-utils.preseed b/config/chroot_local-preseed/preseed-sane-utils.preseed
new file mode 100644
index 0000000..b4f4d91
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-sane-utils.preseed
@@ -0,0 +1,7 @@
+################################################################################
+## preseed-sane-utils
+
+#preseed-sane-utils preseed-sane-utils/preseed boolean false
+
+#preseed-sane-utils preseed-sane-utils/clients string
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-sane.preseed b/config/chroot_local-preseed/preseed-sane.preseed
new file mode 100644
index 0000000..81ece90
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-sane.preseed
@@ -0,0 +1,7 @@
+################################################################################
+## preseed-sane
+
+#preseed-sane preseed-sane/preseed boolean false
+
+#preseed-sane preseed-sane/server string
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-sbuild.preseed b/config/chroot_local-preseed/preseed-sbuild.preseed
new file mode 100644
index 0000000..bf6a887
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-sbuild.preseed
@@ -0,0 +1,10 @@
+################################################################################
+## preseed-sbuild
+
+#preseed-sbuild preseed-sbuild/preseed boolean false
+
+#preseed-sbuild preseed-sbuild/chroots multiselect sid
+#preseed-sbuild preseed-sbuild/description string Debian
+#preseed-sbuild preseed-sbuild/directory string /srv/chroot
+#preseed-sbuild preseed-sbuild/mirror string http://ftp.debian.org/debian/
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-screen.preseed b/config/chroot_local-preseed/preseed-screen.preseed
new file mode 100644
index 0000000..f49fc6b
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-screen.preseed
@@ -0,0 +1,27 @@
+################################################################################
+## preseed-screen
+
+#preseed-screen preseed-screen/preseed boolean false
+preseed-screen preseed-screen/preseed boolean true
+
+#preseed-screen preseed-screen/altscreen boolean false
+preseed-screen preseed-screen/altscreen boolean true
+#preseed-screen preseed-screen/compacthist boolean false
+preseed-screen preseed-screen/compacthist boolean true
+#preseed-screen preseed-screen/defscrollback string 1024
+preseed-screen preseed-screen/defscrollback string 10000
+#preseed-screen preseed-screen/defutf8 boolean false
+preseed-screen preseed-screen/defutf8 boolean true
+#preseed-screen preseed-screen/hardstatus boolean false
+preseed-screen preseed-screen/hardstatus boolean true
+#preseed-screen preseed-screen/hardstatus-alwayslastline boolean false
+preseed-screen preseed-screen/hardstatus-alwayslastline boolean true
+#preseed-screen preseed-screen/hardstatus-string string
+preseed-screen preseed-screen/hardstatus-string string "%{.bW}%-w%{.rW}%n %t%{-}%+w %=%{..G} %H %{..Y} %m/%d %C%a "
+#preseed-screen preseed-screen/shell-login boolean false
+preseed-screen preseed-screen/shell-login boolean true
+#preseed-screen preseed-screen/startup-message boolean true
+preseed-screen preseed-screen/startup-message boolean false
+#preseed-screen preseed-screen/vbell boolean true
+preseed-screen preseed-screen/vbell boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-sudo.preseed b/config/chroot_local-preseed/preseed-sudo.preseed
new file mode 100644
index 0000000..eedbca1
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-sudo.preseed
@@ -0,0 +1,10 @@
+################################################################################
+## preseed-sudo
+
+#preseed-sudo preseed-sudo/preseed boolean false
+preseed-sudo preseed-sudo/preseed boolean true
+
+#preseed-sudo preseed-sudo/group-name string sudo
+#preseed-sudo preseed-sudo/group-number string 27
+#preseed-sudo preseed-sudo/nopasswd boolean false
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-tpb.preseed b/config/chroot_local-preseed/preseed-tpb.preseed
new file mode 100644
index 0000000..6dd54ed
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-tpb.preseed
@@ -0,0 +1,17 @@
+################################################################################
+## preseed-tpb
+
+#preseed-tpb preseed-tpb/preseed boolean false
+
+#preseed-tpb preseed-tpb/thinkpad string
+#preseed-tpb preseed-tpb/home string
+#preseed-tpb preseed-tpb/search string
+#preseed-tpb preseed-tpb/mail string
+#preseed-tpb preseed-tpb/wireless string
+#preseed-tpb preseed-tpb/favorites
+#preseed-tpb preseed-tpb/reload string
+#preseed-tpb preseed-tpb/abort string
+#preseed-tpb preseed-tpb/backward string
+#preseed-tpb preseed-tpb/forward string
+#preseed-tpb preseed-tpb/fn string
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-vim.preseed b/config/chroot_local-preseed/preseed-vim.preseed
new file mode 100644
index 0000000..cad6214
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-vim.preseed
@@ -0,0 +1,19 @@
+################################################################################
+## preseed-vim
+
+#preseed-vim preseed-vim/preseed boolean false
+preseed-vim preseed-vim/preseed boolean true
+
+#preseed-vim preseed-vim/ai boolean false
+preseed-vim preseed-vim/ai boolean true
+#preseed-vim preseed-vim/syntax boolean false
+preseed-vim preseed-vim/syntax boolean true
+#preseed-vim preseed-vim/highlight-whitespace-eol boolean false
+preseed-vim preseed-vim/highlight-whitespace-eol boolean true
+#preseed-vim preseed-vim/hlsearch boolean false
+preseed-vim preseed-vim/hlsearch boolean true
+#preseed-vim preseed-vim/incsearch boolean false
+preseed-vim preseed-vim/incsearch boolean true
+#preseed-vim preseed-vim/noerrorbells boolean false
+preseed-vim preseed-vim/noerrorbells boolean true
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-xen-utils.preseed b/config/chroot_local-preseed/preseed-xen-utils.preseed
new file mode 100644
index 0000000..8d32d37
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-xen-utils.preseed
@@ -0,0 +1,10 @@
+################################################################################
+## preseed-xen-utils
+
+#preseed-xen-utils preseed-xen-utils/preseed boolean false
+
+#preseed-xen-utils preseed-xen-utils/network-script select network-dummy
+#preseed-xen-utils preseed-xen-utils/vif-script select vif-bridge
+#preseed-xen-utils preseed-xen-utils/dom0-cpus string 0
+#preseed-xen-utils preseed-xen-utils/dom0-min-mem string 196
+################################################################################
diff --git a/config/chroot_local-preseed/preseed-xterm.preseed b/config/chroot_local-preseed/preseed-xterm.preseed
new file mode 100644
index 0000000..a005afc
--- /dev/null
+++ b/config/chroot_local-preseed/preseed-xterm.preseed
@@ -0,0 +1,15 @@
+################################################################################
+## preseed-xterm
+
+#preseed-xterm preseed-xterm/preseed boolean false
+
+#preseed-xterm preseed-xterm/background string black
+#preseed-xterm preseed-xterm/cursor-blink boolean true
+#preseed-xterm preseed-xterm/foreground string white
+#preseed-xterm preseed-xterm/login-shell boolean true
+#preseed-xterm preseed-xterm/on-2-clicks string regex \[^/@ \n]+
+#preseed-xterm preseed-xterm/on-3-clicks string regex \[^ \n]+
+#preseed-xterm preseed-xterm/on-4-clicks string regex \[^#$]+
+#preseed-xterm preseed-xterm/on-5-clicks string line
+#preseed-xterm preseed-xterm/utf8 boolean true
+################################################################################
diff --git a/config/chroot_local-preseed/shell-helper.preseed b/config/chroot_local-preseed/shell-helper.preseed
new file mode 100644
index 0000000..6e7df25
--- /dev/null
+++ b/config/chroot_local-preseed/shell-helper.preseed
@@ -0,0 +1,8 @@
+################################################################################
+## shell-helper
+
+#shell-helper shell-helper/force boolean false
+#shell-helper shell-helper/comments boolean true
+#shell-helper shell-helper/verbose boolean false
+#shell-helper shell-helper/color boolean true
+################################################################################
diff --git a/config/chroot_sources/debian-custom.binary b/config/chroot_sources/debian-custom.binary
new file mode 120000
index 0000000..d5e8581
--- /dev/null
+++ b/config/chroot_sources/debian-custom.binary
@@ -0,0 +1 @@
+debian-custom.chroot
\ No newline at end of file
diff --git a/config/chroot_sources/debian-custom.binary.gpg b/config/chroot_sources/debian-custom.binary.gpg
new file mode 120000
index 0000000..ff0039d
--- /dev/null
+++ b/config/chroot_sources/debian-custom.binary.gpg
@@ -0,0 +1 @@
+debian-custom.chroot.gpg
\ No newline at end of file
diff --git a/config/chroot_sources/debian-custom.chroot b/config/chroot_sources/debian-custom.chroot
new file mode 100644
index 0000000..4fb8c68
--- /dev/null
+++ b/config/chroot_sources/debian-custom.chroot
@@ -0,0 +1,3 @@
+# Debian Custom
+deb http://custom.debian.net/debian/ ./
+deb-src http://custom.debian.net/debian/ ./
diff --git a/config/chroot_sources/debian-custom.chroot.gpg b/config/chroot_sources/debian-custom.chroot.gpg
new file mode 100644
index 0000000..278d2f9
--- /dev/null
+++ b/config/chroot_sources/debian-custom.chroot.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
+Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
+MmSuhuWHmXfD9KHXEfvViY93OqxmlF19TDhSS32GYdz4jTtAyos8YOLoGwCgxv6j
+iZLDC2akbtmG7YY924DAOEED/3zsMWC/CxQo0X4gDXA1UkRq7D5I7xnHrEcpe3U/
++md5mrtfZonaL+JVymao9qNqe3wNQYRc3/ahi4UNoL0JRv5VzoC16ncAQiLJaipz
+ccaU/zH4SIm7Md53Dln+Wgtj0cB5VeXWdPFJfIGEUZYE3adtav+g1OmsYsqsyncW
+alP9A/90eUXZN0zoq4RWAMS4Pk9BgSQVL7IFebq1Ovmp+LAo/VZccoKuvRCCPkTN
+rn9EhORJrx99Ip+wL7gdT0APr3+YbBXdiQjROBIioW9PUxqV3EcUn6A1hh+K+cl3
+aAyedeZ51+YstBDg1y8GGIVe1U3C+NcIIkUDLnbr6TgbxMyyqbRYRGViaWFuIFVu
+b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDgpIDxm
+dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJHe6mZAhsD
+BQkCChIABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc2v/B/2405rBZwCgnDBh
+P7wKQLv9AJNUuoXwMBjd+bEAn01AVXyMUI2/CvvsrmL1vHXs352iuQINBEd7qbUQ
+CADErp0VK76K6vh1+k8hiZakbpBSsOV7pSmiWHQK6yI5ZdHAOMlGe+APD6+TQ7Bj
+yJniSlHR8w0Fpws7NEzkAZkq1Dz6wwrqcRFWH155TrHPJe+LiJOM9xtq6EMjPAUS
+Mm44ntN9Z87yO6qmG81f/hrQXCZgiHXUCHnY5PaQ3wTviOdFng1lPbusG5DvXPPG
+SVUeKJyy3yuFnRNuxcrcRpmVN+TXB+jTDVKXxfaXM9Ix9UvLIFV/V56lVRJ9qDUw
+0bGf8Qo71bazHSGVHRdxuhzCMdvRknsoYfpDA9jpYPCLnOER3yT9Q81UQPNSH4pQ
+USOR0XoKg7hXcajLX9QKjNL3AAQNCADD2w+081KUT1EsnrqKkdYS9Ip8weJKRohq
+xFc696dYYTqKU1jAr4exECslrEBvUPfMqF+9sjA4iMHnjbTSSel+b29mXeVXTpvf
+DMueeJLb+4OnXRgThhfJ/BBwTVrxNdxtdbqF8bLvEFGgf+XLcm6ikXmxMbUj+V2u
+dVa+h6XlfyAS91GeCuUXsk6338QtBVxlaP/RXzIrfnQ/xJEjON/950DlsAlS0jxI
+mWsWhYXp6/ggGq8/2p9h/9CXALCSxUiOpzMBCzKtKg3o9uK+p2jWEIv2MjxFHhpV
+WfGUYrNpIt4qBAU9wPp1zSHw2hFhb2KPkUJSvf+SOn548pOJxiyTiE8EGBECAA8F
+Akd7qbUCGwwFCQIKEgAACgkQc2v/B/2405o+DwCgxpzJdJNQXxckpxJ2tmIaUqsY
+adgAnj/MyOnOtFiVmrUbcgnUcSNPQtV3
+=xI0k
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/chroot_sources/debian-live.binary b/config/chroot_sources/debian-live.binary
new file mode 120000
index 0000000..a5f2793
--- /dev/null
+++ b/config/chroot_sources/debian-live.binary
@@ -0,0 +1 @@
+debian-live.chroot
\ No newline at end of file
diff --git a/config/chroot_sources/debian-live.binary.gpg b/config/chroot_sources/debian-live.binary.gpg
new file mode 120000
index 0000000..e9b492d
--- /dev/null
+++ b/config/chroot_sources/debian-live.binary.gpg
@@ -0,0 +1 @@
+debian-live.binary.gpg
\ No newline at end of file
diff --git a/config/chroot_sources/debian-live.chroot b/config/chroot_sources/debian-live.chroot
new file mode 100644
index 0000000..db2aa7d
--- /dev/null
+++ b/config/chroot_sources/debian-live.chroot
@@ -0,0 +1,3 @@
+# Debian Live
+deb http://live.debian.net/debian/ ./
+deb-src http://live.debian.net/debian/ ./
diff --git a/config/chroot_sources/debian-live.chroot.gpg b/config/chroot_sources/debian-live.chroot.gpg
new file mode 100644
index 0000000..278d2f9
--- /dev/null
+++ b/config/chroot_sources/debian-live.chroot.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
+Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
+MmSuhuWHmXfD9KHXEfvViY93OqxmlF19TDhSS32GYdz4jTtAyos8YOLoGwCgxv6j
+iZLDC2akbtmG7YY924DAOEED/3zsMWC/CxQo0X4gDXA1UkRq7D5I7xnHrEcpe3U/
++md5mrtfZonaL+JVymao9qNqe3wNQYRc3/ahi4UNoL0JRv5VzoC16ncAQiLJaipz
+ccaU/zH4SIm7Md53Dln+Wgtj0cB5VeXWdPFJfIGEUZYE3adtav+g1OmsYsqsyncW
+alP9A/90eUXZN0zoq4RWAMS4Pk9BgSQVL7IFebq1Ovmp+LAo/VZccoKuvRCCPkTN
+rn9EhORJrx99Ip+wL7gdT0APr3+YbBXdiQjROBIioW9PUxqV3EcUn6A1hh+K+cl3
+aAyedeZ51+YstBDg1y8GGIVe1U3C+NcIIkUDLnbr6TgbxMyyqbRYRGViaWFuIFVu
+b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDgpIDxm
+dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJHe6mZAhsD
+BQkCChIABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc2v/B/2405rBZwCgnDBh
+P7wKQLv9AJNUuoXwMBjd+bEAn01AVXyMUI2/CvvsrmL1vHXs352iuQINBEd7qbUQ
+CADErp0VK76K6vh1+k8hiZakbpBSsOV7pSmiWHQK6yI5ZdHAOMlGe+APD6+TQ7Bj
+yJniSlHR8w0Fpws7NEzkAZkq1Dz6wwrqcRFWH155TrHPJe+LiJOM9xtq6EMjPAUS
+Mm44ntN9Z87yO6qmG81f/hrQXCZgiHXUCHnY5PaQ3wTviOdFng1lPbusG5DvXPPG
+SVUeKJyy3yuFnRNuxcrcRpmVN+TXB+jTDVKXxfaXM9Ix9UvLIFV/V56lVRJ9qDUw
+0bGf8Qo71bazHSGVHRdxuhzCMdvRknsoYfpDA9jpYPCLnOER3yT9Q81UQPNSH4pQ
+USOR0XoKg7hXcajLX9QKjNL3AAQNCADD2w+081KUT1EsnrqKkdYS9Ip8weJKRohq
+xFc696dYYTqKU1jAr4exECslrEBvUPfMqF+9sjA4iMHnjbTSSel+b29mXeVXTpvf
+DMueeJLb+4OnXRgThhfJ/BBwTVrxNdxtdbqF8bLvEFGgf+XLcm6ikXmxMbUj+V2u
+dVa+h6XlfyAS91GeCuUXsk6338QtBVxlaP/RXzIrfnQ/xJEjON/950DlsAlS0jxI
+mWsWhYXp6/ggGq8/2p9h/9CXALCSxUiOpzMBCzKtKg3o9uK+p2jWEIv2MjxFHhpV
+WfGUYrNpIt4qBAU9wPp1zSHw2hFhb2KPkUJSvf+SOn548pOJxiyTiE8EGBECAA8F
+Akd7qbUCGwwFCQIKEgAACgkQc2v/B/2405o+DwCgxpzJdJNQXxckpxJ2tmIaUqsY
+adgAnj/MyOnOtFiVmrUbcgnUcSNPQtV3
+=xI0k
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/chroot_sources/debian-restricted.binary b/config/chroot_sources/debian-restricted.binary
new file mode 120000
index 0000000..5bcfdb9
--- /dev/null
+++ b/config/chroot_sources/debian-restricted.binary
@@ -0,0 +1 @@
+debian-restricted.chroot
\ No newline at end of file
diff --git a/config/chroot_sources/debian-restricted.binary.gpg b/config/chroot_sources/debian-restricted.binary.gpg
new file mode 120000
index 0000000..889c924
--- /dev/null
+++ b/config/chroot_sources/debian-restricted.binary.gpg
@@ -0,0 +1 @@
+debian-restricted.chroot.gpg
\ No newline at end of file
diff --git a/config/chroot_sources/debian-restricted.chroot b/config/chroot_sources/debian-restricted.chroot
new file mode 100644
index 0000000..b0d679e
--- /dev/null
+++ b/config/chroot_sources/debian-restricted.chroot
@@ -0,0 +1,3 @@
+# Debian Restricted
+deb http://restricted.debian.net/debian/ ./
+deb-src http://restricted.debian.net/debian/ ./
diff --git a/config/chroot_sources/debian-restricted.chroot.gpg b/config/chroot_sources/debian-restricted.chroot.gpg
new file mode 100644
index 0000000..278d2f9
--- /dev/null
+++ b/config/chroot_sources/debian-restricted.chroot.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
+Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
+MmSuhuWHmXfD9KHXEfvViY93OqxmlF19TDhSS32GYdz4jTtAyos8YOLoGwCgxv6j
+iZLDC2akbtmG7YY924DAOEED/3zsMWC/CxQo0X4gDXA1UkRq7D5I7xnHrEcpe3U/
++md5mrtfZonaL+JVymao9qNqe3wNQYRc3/ahi4UNoL0JRv5VzoC16ncAQiLJaipz
+ccaU/zH4SIm7Md53Dln+Wgtj0cB5VeXWdPFJfIGEUZYE3adtav+g1OmsYsqsyncW
+alP9A/90eUXZN0zoq4RWAMS4Pk9BgSQVL7IFebq1Ovmp+LAo/VZccoKuvRCCPkTN
+rn9EhORJrx99Ip+wL7gdT0APr3+YbBXdiQjROBIioW9PUxqV3EcUn6A1hh+K+cl3
+aAyedeZ51+YstBDg1y8GGIVe1U3C+NcIIkUDLnbr6TgbxMyyqbRYRGViaWFuIFVu
+b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDgpIDxm
+dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJHe6mZAhsD
+BQkCChIABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc2v/B/2405rBZwCgnDBh
+P7wKQLv9AJNUuoXwMBjd+bEAn01AVXyMUI2/CvvsrmL1vHXs352iuQINBEd7qbUQ
+CADErp0VK76K6vh1+k8hiZakbpBSsOV7pSmiWHQK6yI5ZdHAOMlGe+APD6+TQ7Bj
+yJniSlHR8w0Fpws7NEzkAZkq1Dz6wwrqcRFWH155TrHPJe+LiJOM9xtq6EMjPAUS
+Mm44ntN9Z87yO6qmG81f/hrQXCZgiHXUCHnY5PaQ3wTviOdFng1lPbusG5DvXPPG
+SVUeKJyy3yuFnRNuxcrcRpmVN+TXB+jTDVKXxfaXM9Ix9UvLIFV/V56lVRJ9qDUw
+0bGf8Qo71bazHSGVHRdxuhzCMdvRknsoYfpDA9jpYPCLnOER3yT9Q81UQPNSH4pQ
+USOR0XoKg7hXcajLX9QKjNL3AAQNCADD2w+081KUT1EsnrqKkdYS9Ip8weJKRohq
+xFc696dYYTqKU1jAr4exECslrEBvUPfMqF+9sjA4iMHnjbTSSel+b29mXeVXTpvf
+DMueeJLb+4OnXRgThhfJ/BBwTVrxNdxtdbqF8bLvEFGgf+XLcm6ikXmxMbUj+V2u
+dVa+h6XlfyAS91GeCuUXsk6338QtBVxlaP/RXzIrfnQ/xJEjON/950DlsAlS0jxI
+mWsWhYXp6/ggGq8/2p9h/9CXALCSxUiOpzMBCzKtKg3o9uK+p2jWEIv2MjxFHhpV
+WfGUYrNpIt4qBAU9wPp1zSHw2hFhb2KPkUJSvf+SOn548pOJxiyTiE8EGBECAA8F
+Akd7qbUCGwwFCQIKEgAACgkQc2v/B/2405o+DwCgxpzJdJNQXxckpxJ2tmIaUqsY
+adgAnj/MyOnOtFiVmrUbcgnUcSNPQtV3
+=xI0k
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/desktop/config/binary b/desktop/config/binary
deleted file mode 100644
index 1c9f2d4..0000000
--- a/desktop/config/binary
+++ /dev/null
@@ -1,74 +0,0 @@
-# config/binary - options for live-helper(7), binary stage
-
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
-
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-LH_BINARY_INDICES="enabled"
-
-# $LH_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND=""
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LH_BOOTLOADER="syslinux"
-
-# $LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LH_CHROOT_BUILD="enabled"
-
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LH_DEBIAN_INSTALLER="disabled"
-
-# $LH_ENCRYPTION: set encrytion
-# (Default: empty)
-LH_ENCRYPTION=""
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: debian)
-LH_HOSTNAME="debian"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Debian Live"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a12; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper ${VERSION}; http://packages.qa.debian.org/live-helper"
-
-# $LH_ISO_PUBLISHER: set iso preparer
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
-
-# $LH_ISO_VOLUME: set iso volume
-# (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
-
-# $LH_MEMTEST: set memtest
-# (Default: memtest86+)
-LH_MEMTEST="memtest86+"
-
-# $LH_NET_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LH_NET_PATH="/srv/debian-live"
-
-# $LH_NET_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-LH_NET_SERVER="192.168.1.1"
-
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LH_SYSLINUX_SPLASH=""
-
-# $LH_USERNAME: set username
-# (Default: user)
-LH_USERNAME="user"
diff --git a/desktop/config/bootstrap b/desktop/config/bootstrap
deleted file mode 100644
index 0c6142e..0000000
--- a/desktop/config/bootstrap
+++ /dev/null
@@ -1,37 +0,0 @@
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# $LH_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LH_ARCHITECTURE="i386"
-
-# $LH_DISTRIBUTION: select distribution to use
-# (Default: etch)
-LH_DISTRIBUTION="etch"
-
-# $LH_DISTRIBUTION_CONFIG: set distribution config directory
-# (Default: empty)
-LH_DISTRIBUTION_CONFIG=""
-
-# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: standard)
-LH_BOOTSTRAP_FLAVOUR="standard"
-
-# $LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
-
-# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: http://security.debian.org/)
-LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
-
-# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://ftp.debian.org/debian/)
-LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
-
-# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: http://security.debian.org/)
-LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
-
-# $LH_SECTIONS: select section(s) to use
-# (Default: main)
-LH_SECTIONS="main contrib non-free"
diff --git a/desktop/config/chroot b/desktop/config/chroot
deleted file mode 100644
index 2443ac4..0000000
--- a/desktop/config/chroot
+++ /dev/null
@@ -1,53 +0,0 @@
-# config/chroot - options for live-helper(7), chroot stage
-
-# $LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
-
-# $LH_HOOKS: set hook commands
-# (Default: empty)
-LH_HOOKS=""
-
-# $LH_INTERACTIVE: set interactive build
-# (Default: disabled)
-LH_INTERACTIVE="disabled"
-
-# $LH_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LH_KEYRING_PACKAGES=""
-
-# $LH_LANGUAGE: set language to use
-# (Default: empty)
-LH_LANGUAGE=""
-
-# $LH_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LH_LINUX_FLAVOURS="686"
-
-# $LH_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
-
-# $LH_PACKAGES: set packages to install
-# (Default: empty)
-LH_PACKAGES=""
-
-# $LH_PACKAGES_LISTS: set package list to install
-# (Default: standard)
-LH_PACKAGES_LISTS="standard"
-
-# $LH_TASKS: set tasks to install
-# (Default: empty)
-LH_TASKS=""
-
-# $LH_SECURITY: enable security updates
-# (Default: enabled)
-LH_SECURITY="enabled"
-
-# $LH_SYMLINKS: enable symlink convertion
-# (Default: disabled)
-LH_SYMLINKS="disabled"
-
-# $LH_SYSVINIT: enable sysvinit
-# (Default: disabled)
-LH_SYSVINIT="disabled"
diff --git a/desktop/config/chroot_local-hooks/bash b/desktop/config/chroot_local-hooks/bash
deleted file mode 100644
index f256969..0000000
--- a/desktop/config/chroot_local-hooks/bash
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-cat >> /etc/profile << EOF
-
-if [ "\${TERM}" = "linux" ] && [ "\${SHELL}" = "/bin/bash" ]
-then
-	echo -e "\033[?6c"
-fi
-
-setterm -blength 0 -bfreq 0
-
-trap clear 0
-EOF
-
-cat >> /etc/skel/.bash_profile << EOF
-
-alias cp="cp -i"
-alias ln="ln -i"
-alias mv="mv -i"
-alias rm="rm -i"
-
-alias less="less -R"
-alias ls="ls --color"
-
-export GREP_OPTIONS="--color=auto"
-
-if [ -z "\${DISPLAY}" ] && [ "\`tty\`" = "/dev/tty1" ]
-then
-	startx
-fi
-EOF
diff --git a/desktop/config/chroot_local-hooks/readline b/desktop/config/chroot_local-hooks/readline
deleted file mode 100644
index 8813553..0000000
--- a/desktop/config/chroot_local-hooks/readline
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cat >> /etc/inputrc << EOF
-
-set bell-style visible
-EOF
diff --git a/desktop/config/chroot_local-hooks/screen b/desktop/config/chroot_local-hooks/screen
deleted file mode 100644
index fede9ff..0000000
--- a/desktop/config/chroot_local-hooks/screen
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cat >> /etc/skel/.screenrc << EOF
-altscreen on
-defscrollback 1000
-defutf8 on
-startup_message off
-EOF
diff --git a/desktop/config/chroot_local-hooks/vim b/desktop/config/chroot_local-hooks/vim
deleted file mode 100644
index ec447f3..0000000
--- a/desktop/config/chroot_local-hooks/vim
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cat >> /etc/vim/vimrc << EOF
-
-syntax on
-
-au FileType debchangelog normal z0
-
-highlight WhitespaceEOL ctermbg=red guibg=red
-match WhitespaceEOL /\s\+$/
-EOF
diff --git a/desktop/config/chroot_local-hooks/wmii b/desktop/config/chroot_local-hooks/wmii
deleted file mode 100644
index b28fe99..0000000
--- a/desktop/config/chroot_local-hooks/wmii
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-rm -f /etc/X11/wmii/welcome
-
-sed -i	-e "s/^SELECTED_BG_COLOR=.*/SELECTED_BG_COLOR='#222222'/" \
-	-e "s/^SELECTED_FG_COLOR=.*/SELECTED_FG_COLOR='#ffffff'/" \
-	-e "s/^SELECTED_BORDER_COLOR=.*/SELECTED_BORDER_COLOR='#222222'/" \
-	-e "s/^NORMAL_BG_COLOR=.*/NORMAL_BG_COLOR='#000000'/" \
-	-e "s/^NORMAL_FG_COLOR=.*/NORMAL_FG_COLOR='#AAAAAA'/" \
-	-e "s/^NORMAL_BORDER_COLOR=.*/NORMAL_BORDER_COLOR='#000000'/" \
-	-e "s#wmiir write /wm/default/page/layout.*#wmiir write /wm/default/page/layout float#" \
-	-e "s/xsetroot.*//" \
-	-e "s/status &//" /etc/X11/wmii/wmiirc
-
-cat >> /etc/X11/wmii/wmiirc << EOF
-xloadimage -fullscreen -onroot /etc/X11/wmii/wallpaper
-#xsetroot -solid black
-xset b 0 0
-unclutter -idle 1 -root &
-
-while( ! wmiir read /wm/page/9/ )
-{
-	wmiir write /wm/ctl 'new'
-}
-wmiir write /wm/ctl 'select 1'
-
-status &
-EOF
diff --git a/desktop/config/chroot_local-hooks/xterm b/desktop/config/chroot_local-hooks/xterm
deleted file mode 100644
index 562208f..0000000
--- a/desktop/config/chroot_local-hooks/xterm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cat > /etc/X11/Xresources/xterm << EOF
-! /etc/X11/Xresources/xterm
-
-XTerm*background: black
-XTerm*cursorBlink: true
-XTerm*foreground: white
-XTerm*loginShell: true
-XTerm*scrollBar: false
-XTerm*utf8: 1
-XTerm*visualBell: true
-EOF
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/halt b/desktop/config/chroot_local-includes/etc/X11/wmii/halt
deleted file mode 120000
index e55c94d..0000000
--- a/desktop/config/chroot_local-includes/etc/X11/wmii/halt
+++ /dev/null
@@ -1 +0,0 @@
-../../../usr/local/bin/halt
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/reboot b/desktop/config/chroot_local-includes/etc/X11/wmii/reboot
deleted file mode 120000
index e710c47..0000000
--- a/desktop/config/chroot_local-includes/etc/X11/wmii/reboot
+++ /dev/null
@@ -1 +0,0 @@
-../../../usr/local/bin/reboot
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/status b/desktop/config/chroot_local-includes/etc/X11/wmii/status
deleted file mode 100644
index fe390c7..0000000
--- a/desktop/config/chroot_local-includes/etc/X11/wmii/status
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/lib/9base/bin/rc
-# periodically print date and load average to the bar
-
-PIDFILE=/tmp/.ixp-$USER/statuspid-$WMII_IDENT
-
-if(test -r $PIDFILE) {
-    kill -2 `{cat $PIDFILE} >[2]/dev/null
-}
-echo $pid >$PIDFILE
-
-label=`{wmiir read /bar/new}
-wmiir write /bar/$label/b1press 'wmiir write /wm/ctl ''select prev'''
-wmiir write /bar/$label/b3press 'wmiir write /wm/ctl ''select next'''
-wmiir write /bar/$label/b4press 'wmiir write /wm/ctl ''select prev'''
-wmiir write /bar/$label/b5press 'wmiir write /wm/ctl ''select next'''
-
-# install signal handler for artificial sigexit:
-fn sigint {
-    if(test -f $PIDFILE && ~ `{cat $PIDFILE} $pid)
-        rm -f $PIDFILE
-    wmiir write /bar/ctl 'destroy '^$label
-    exit
-}
-
-fn get_battery () {
-	proc_src=/proc/acpi/battery/*
-	if (test ! -d $proc_src) echo 0
-	if not {
-		awk 'BEGIN {batt=0; cap=1; rem=0;}
-		/^present:.*yes/ {batt=1}
-		/^last/    {cap=$4}
-		/^rem/     {rem=$3}
-		END{if (batt) print int(rem/cap*100)}' $proc_src/*
-	}
-}
-
-fn statustext {
-echo (`{get_battery} '|' `{/bin/date  -R})
-}
-
-text=`{statustext}
-while(wmiir write /bar/$label/data $"text >[2]/dev/null) {
-    sleep 1
-    text=`{statustext}
-}
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-disk b/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-disk
deleted file mode 120000
index c77cdef..0000000
--- a/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-disk
+++ /dev/null
@@ -1 +0,0 @@
-../../../usr/local/bin/suspend-disk
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-mem b/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-mem
deleted file mode 120000
index f8cb3ce..0000000
--- a/desktop/config/chroot_local-includes/etc/X11/wmii/suspend-mem
+++ /dev/null
@@ -1 +0,0 @@
-../../../usr/local/bin/suspend-mem
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/etc/X11/wmii/wallpaper b/desktop/config/chroot_local-includes/etc/X11/wmii/wallpaper
deleted file mode 100644
index eba3df5..0000000
Binary files a/desktop/config/chroot_local-includes/etc/X11/wmii/wallpaper and /dev/null differ
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/apt-check b/desktop/config/chroot_local-includes/usr/local/bin/apt-check
deleted file mode 100755
index 91e206a..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/apt-check
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# apt-check.sh - Check for package updates
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-EMAIL="root"
-
-DATE="`date +%Y-%m-%d`"
-HOSTNAME="`hostname`"
-
-TEMPFILE="`mktemp -t apt-check.XXXXXXXX`"
-
-# Updating package indices
-apt-get update -qq
-
-# Checking package updates
-if [ "`apt-get upgrade -s | grep -c '^Inst'`" -ne "0" ]
-then
-
-cat > "${TEMPFILE}" << EOF
-To: ${EMAIL}
-From: apt-check@${HOSTNAME}
-Subject: apt-check on ${HOSTNAME} (${DATE})
-
-Dear System Administrator,
-
-the following package updates are available on ${HOSTNAME}. We recommend that you upgrade your system as soon as possible.
-
-`apt-get upgrade -s | grep '^Inst' | sed -e 's/^Inst /\t/g'`
-
-Regards,
-apt-check (the script behind the curtain)
-EOF
-
-	cat "${TEMPFILE}" | /usr/sbin/sendmail -t -F "apt-check@${HOSTNAME}" -f "apt-check@${HOSTNAME}"
-	rm -f "${TEMPFILE}"
-fi
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/apt-ftparchives b/desktop/config/chroot_local-includes/usr/local/bin/apt-ftparchives
deleted file mode 100755
index 86b7c88..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/apt-ftparchives
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-apt-ftparchive packages . /dev/null > Packages
-gzip -9 -c Packages > Packages.gz
-bzip2 -9 -c Packages > Packages.bz2
-
-apt-ftparchive sources . /dev/null > Sources
-gzip -9 -c Sources > Sources.gz
-bzip2 -9 -c Sources > Sources.bz2
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/build b/desktop/config/chroot_local-includes/usr/local/bin/build
deleted file mode 100755
index 25eaac3..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/build
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-prepare
-dpkg-buildpackage ${@}
-cd ..
-rm -rf */
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/builds b/desktop/config/chroot_local-includes/usr/local/bin/builds
deleted file mode 100755
index 6c22652..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/builds
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-prepare
-dpkg-buildpackages ${@}
-cd ..
-rm -rf */
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/cdebootstraps b/desktop/config/chroot_local-includes/usr/local/bin/cdebootstraps
deleted file mode 100755
index d2531aa..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/cdebootstraps
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/bin/sh
-
-# cdebootstraps.sh - Wrapper for cdebootstrap(1)
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# Static variables
-CODENAME_OLDSTABLE="sarge"
-CODENAME_OLDSTABLE_BACKPORTS="sarge"
-CODENAME_STABLE="etch"
-CODENAME_STABLE_BACKPORTS="etch"
-CODENAME_TESTING="lenny"
-CODENAME_UNSTABLE="sid"
-
-ACTION="${1}"
-DISTRIBUTION="${2}"
-
-# Dynamic variables
-DIRECTORY_CHROOT="/mnt/debian"
-
-MIRROR="http://10.0.0.11/ftp.debian.org/debian/"
-MIRROR_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
-MIRROR_BACKPORTS="http://10.0.0.11/ftp.debian.org/debian-backports/"
-
-USER="user"
-
-# Defaults
-if [ -z "${DISTRIBUTION}" ]
-then
-	DISTRIBUTION="unstable"
-fi
-
-case "${DISTRIBUTION}" in
-	oldstable-backports|"${CODENAME_OLDSTABLE}"-backports)
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_OLDSTABLE}-backports"
-		DISTRIBUTION="${CODENAME_OLDSTABLE}"
-		;;
-
-	oldstable|"${CODENAME_OLDSTABLE}")
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_OLDSTABLE}"
-		DISTRIBUTION="${CODENAME_OLDSTABLE}"
-		;;
-
-	stable-backports|"${CODENAME_STABLE}"-backports)
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_STABLE}-backports"
-		DISTRIBUTION="${CODENAME_STABLE}"
-		;;
-
-	stable|"${CODENAME_STABLE}")
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_STABLE}"
-		DISTRIBUTION="${CODENAME_STABLE}"
-		;;
-
-	testing|"${CODENAME_TESTING}")
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_TESTING}"
-		DISTRIBUTION="${CODENAME_TESTING}"
-		;;
-
-	unstable|"${CODENAME_UNSTABLE}")
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_UNSTABLE}"
-		DISTRIBUTION="${CODENAME_UNSTABLE}"
-		;;
-
-	devel)
-		CHROOT="${DIRECTORY_CHROOT}/devel"
-		DISTRIBUTION="${CODENAME_UNSTABLE}"
-		;;
-esac
-
-Chroot()
-{
-	COMMANDS="${1}"
-
-	# Executing commands in chroot
-	chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ${COMMANDS}
-	# linux32 chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ${COMMANDS}
-}
-
-case "${ACTION}" in
-	uninstall)
-		# Unmounting file system
-		fuser -km "${CHROOT}"
-		killall -9 syslogd || true
-		killall -9 klogd || true
-
-		umount "${CHROOT}"/sys || true
-		umount "${CHROOT}"/proc || true
-		umount "${CHROOT}"/lib/init/rw || true
-		umount "${CHROOT}"/dev/shm || true
-		umount "${CHROOT}"/dev/pts || true
-		umount "${CHROOT}"/dev || true
-		umount "${CHROOT}" || true
-
-		# Removing directory
-		rm -rf "${CHROOT}"
-		;;
-
-	install)
-		# Creating directory
-		mkdir -p "${CHROOT}"
-
-		# Bootstrapping chroot
-		cdebootstrap ${DISTRIBUTION} ${CHROOT} ${MIRROR}
-		rm -rf ${CHROOT}/var/cache/bootstrap
-		;;
-
-	configure)
-		# Hack network
-		cp /etc/resolv.conf "${CHROOT}"/etc
-		cp /etc/hosts "${CHROOT}"/etc
-
-		# Configuring sources.list
-		echo "deb ${MIRROR} ${DISTRIBUTION} main contrib non-free" > "${CHROOT}"/etc/apt/sources.list
-		echo "deb-src ${MIRROR} ${DISTRIBUTION} main contrib non-free" >> "${CHROOT}"/etc/apt/sources.list
-
-		if [ "${DISTRIBUTION}" != "${CODENAME_UNSTABLE}" ]
-		then
-			echo "deb ${MIRROR_SECURITY} ${DISTRIBUTION}/updates main contrib non-free" >> "${CHROOT}"/etc/apt/sources.list
-			echo "deb-src ${MIRROR_SECURITY} ${DISTRIBUTION}/updates main contrib non-free" >> "${CHROOT}"/etc/apt/sources.list
-		fi
-
-		Chroot "echo '${DISTRIBUTION}_`dpkg --print-architecture`' > /etc/debian_chroot"
-
-		# Updating indices
-		Chroot "apt-get --force-yes --yes install -f"
-		Chroot "apt-get --force-yes --yes install"
-		Chroot "apt-get --force-yes --yes update"
-		Chroot "apt-get --force-yes --yes upgrade"
-		Chroot "apt-get --force-yes --yes dist-upgrade"
-		Chroot "apt-get --force-yes --yes install -f"
-		Chroot "apt-get --force-yes --yes install"
-		Chroot "apt-get --force-yes --yes clean"
-		;;
-
-	custom)
-		# Custom packages
-		Chroot "apt-get --force-yes --yes install vim"
-		Chroot "apt-get --force-yes --yes remove --purge ed nano nvi"
-		Chroot "apt-get --force-yes --yes remove --purge ppp"
-		Chroot "apt-get --force-yes --yes install build-essential debhelper dh-make lintian fakeroot gnupg locales less devscripts wdiff autotools-dev"
-
-		if [ "${DISTRIBUTION}" != "oldstable" ]
-		then
-			Chroot "apt-get --force-yes --yes install dpatch"
-		fi
-
-		if [ ${DISTRIBUTION} = "oldstable" ] || [ ${DISTRIBUTION} = "oldstable-backports" ]
-		then
-			Chroot "apt-get install --force-yes --yes adduser"
-		fi
-
-		Chroot "apt-get --force-yes --yes clean"
-
-		# Custom configuration
-		sed -i -e 's/.*syntax on/syntax on/' "${CHROOT}"/etc/vim/vimrc
-
-cat >> "${CHROOT}"/etc/vim/vimrc << "EOF"
-
-highlight WhitespaceEOL ctermbg=red guibg=red
-match WhitespaceEOL /\s\+$/
-EOF
-
-cat >> "${CHROOT}"/etc/profile << "EOF"
-
-alias cp="cp -i"
-alias ln="ln -i"
-alias mv="mv -i"
-alias rm="rm -i"
-
-alias less="less -R"
-alias ls="ls --color"
-
-export GREP_OPTIONS="--color=auto"
-
-#LANGUAGE="en_US"
-#LC_ALL="en_US"
-#LANG="en_US"
-#export LANGUAGE LC_ALL LANG
-EOF
-
-		echo "Root password"
-		Chroot "passwd"
-		Chroot "adduser ${USER}"
-		;;
-
-	all)
-		"${0}" install ${DISTRIBUTION}
-		"${0}" configure ${DISTRIBUTION}
-		"${0}" custom ${DISTRIBUTION}
-		;;
-
-	chroot)
-		# Enter chroot
-		#linux32 chroot "${CHROOT}" /bin/bash --login
-		chroot "${CHROOT}" /bin/bash --login
-		;;
-
-	update)
-		# Updating chroot
-		Chroot "apt-get --force-yes --yes update"
-		Chroot "apt-get --force-yes --yes upgrade"
-		Chroot "apt-get --force-yes --yes dist-upgrade"
-		Chroot "apt-get --force-yes --yes clean"
-		;;
-
-	save)
-		killall -9 syslogd || true
-		killall -9 klogd || true
-
-		# Unmounting file systems
-		umount "${CHROOT}"/sys || true
-		umount "${CHROOT}"/proc || true
-		umount "${CHROOT}"/lib/init/rw || true
-		umount "${CHROOT}"/dev/shm || true
-		umount "${CHROOT}"/dev/pts || true
-		umount "${CHROOT}"/dev || true
-
-		# Cleaning home directories
-		rm -f "${CHROOT}"/root/.bash_history
-		rm -f "${CHROOT}"/root/.viminfo
-		rm -f "${CHROOT}"/home/${USER}/.bash_history
-		rm -f "${CHROOT}"/home/${USER}/.viminfo
-		rm -rf "${CHROOT}"/var/tmp/vi.recover
-
-		# Saving chroot
-		rsync -av --delete "${CHROOT}"/ "${CHROOT}".snapshot
-
-		# Remounting file systems
-		mount proc-`basename ${CHROOT}` "${CHROOT}"/proc -t proc
-		;;
-
-	restore)
-		killall -9 syslogd || true
-		killall -9 klogd || true
-
-		# Unmounting file systems
-		umount "${CHROOT}"/sys || true
-		umount "${CHROOT}"/proc || true
-		umount "${CHROOT}"/lib/init/rw || true
-		umount "${CHROOT}"/dev/shm || true
-		umount "${CHROOT}"/dev/pts || true
-		umount "${CHROOT}"/dev || true
-
-		# Restoring chroot
-		rsync -av --delete "${CHROOT}".snapshot/ "${CHROOT}"
-
-		# Remounting file systems
-		mount proc-`basename ${CHROOT}` "${CHROOT}"/proc -t proc
-		;;
-
-	reset)
-		"${0}" restore `basename ${CHROOT}`
-		"${0}" update `basename ${CHROOT}`
-		"${0}" save `basename ${CHROOT}`
-		;;
-esac
-
-#echo "debootstraps - Meta script for debootstrap(8)"
-#echo
-#echo -e "Usage: \t `basename ${0}` [TARGET] [DISTRIBUTION]"
-#echo -e "Usage: \t `basename ${0}` [OPTION]"
-#echo
-#echo "Targets:"
-#echo -e "\t uninstall: \t\t remove chroot"
-#echo -e "\t install:   \t\t bootstrap chroot"
-#echo -e "\t configure: \t\t configure chroot"
-#echo -e "\t custom:    \t\t install custom packages"
-#echo -e "\t all:       \t\t execute all targets"
-#echo
-#echo -e "\t chroot:    \t\t enter chroot"
-#echo -e "\t update:    \t\t update chroot"
-#echo -e "\t save:      \t\t saves chroot to \$CHROOT.snapshot"
-#echo -e "\t restore:   \t\t restores chroot from \$CHROOT.snapshot"
-#echo
-#echo "Distributions:"
-#echo -e "\t oldstable: \t\t Debian GNU/Linux oldstable (Woody)"
-#echo -e "\t stable:    \t\t Debian GNU/Linux stable (Sarge)"
-#echo -e "\t testing:   \t\t Debian GNU/Linux testing (Etch)"
-#echo -e "\t unstable:  \t\t Debian GNU/Linux unstable (Sid)"
-#echo -e "\t all:       \t\t execute all distributions"
-#echo
-#echo "Options:"
-#echo -e "\t -h, --help:    \t display this help and exit"
-#echo -e "\t -u, --usage:   \t show usage and exit"
-#echo -e "\t -v, --version: \t output version information and exit"
-#exit 1
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/chmods b/desktop/config/chroot_local-includes/usr/local/bin/chmods
deleted file mode 100755
index e731638..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/chmods
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# chmods.sh - Setting default file access permissions
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-EXCLUDES="*.changes"
-EXECUTABLES="*.sh"
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ]
-then
-	echo "chmods.sh - Setting default file access permissions"
-	echo
-	echo "Usage: `basename ${0}` [DIRECTORY]"
-	exit 1
-fi
-
-# Setting path
-if [ -n "${1}" ]
-then
-	DIRECTORY="${1}"
-else
-	DIRECTORY="`pwd`"
-fi
-
-# Process directories
-find "${DIRECTORY}" -type d | xargs chmod 0755 || true
-find "${DIRECTORY}" -type d -name lost+found | xargs chmod 0700 || true
-
-# Process files
-find "${DIRECTORY}" -type f | xargs chmod 0644 || true
-
-# Process excludes
-for EXCLUDES in ${EXCLUDES}
-do
-	find "${DIRECTORY}" -type f -name "${EXCLUDES}" | xargs chmod 0640 || true
-done
-
-# Process executables
-for EXECUTABLE in ${EXECUTABLES}
-do
-	find "${DIRECTORY}" -type f -name "${EXECUTABLE}" | xargs chmod 0755 || true
-done
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/chowns b/desktop/config/chroot_local-includes/usr/local/bin/chowns
deleted file mode 100755
index ddfc9e3..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/chowns
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# chowns.sh - Setting default file owner and group
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-USER="root"
-GROUP="${USER}"
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ]
-then
-	echo "chowns.sh - Setting default file owner and group"
-	echo
-	echo "Usage: `basename ${0}` [USER]"
-	exit 1
-fi
-
-# Process data
-if [ ! -z "${1}" ]
-then
-	chown "${1}":"${1}" "`pwd`" -R
-else
-	chown "${USER}":"${GROUP}" "`pwd`" -R
-fi
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/cpufreqs b/desktop/config/chroot_local-includes/usr/local/bin/cpufreqs
deleted file mode 100755
index 4437a60..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/cpufreqs
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/bin/sh
-
-# cpufreqs.sh - Setting cpu frequencies
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ] || [ -z "${1}" ]
-then
-	echo "cpufreqs.sh - Setting cpu frequencies"
-	echo
-	echo "Usage: `basename ${0}` {gov|per|ond|use|ava|cur|man|max|min}"
-	echo "Usage: `basename ${0}` {governor|performance|ondemand|userspace|available|current|manual|maximal|minimal}"
-	exit 1
-fi
-
-# Check if cpufreq is loaded
-if [ ! -d /sys/devices/system/cpu/cpu0/cpufreq ]
-then
-	echo "E: no cpu driver loaded (or sysfs not mounted)."
-	exit 1
-fi
-
-# Change directory
-cd /sys/devices/system/cpu
-
-case "${1}" in
-	gov|governor)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			echo "${CPU}: current governor `cat scaling_governor`."
-		done
-		;;
-
-	per|performance)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-
-			echo "${CPU}: current governor `cat scaling_governor`."
-
-			if [ "`cat scaling_governor`" = "performance" ]
-			then
-				echo "${CPU}: governor already set to `cat scaling_governor`."
-			else
-				cat scaling_available_governors | grep -q "performance"
-
-				if [ "${?}" = "0" ]
-				then
-					echo "performance" > scaling_governor
-					echo "${CPU}: governor set to `cat scaling_governor`."
-				else
-					echo "E: unavailable governor performance."
-					exit 1
-				fi
-			fi
-		done
-		;;
-
-	ond|ondemand)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-
-			echo "${CPU}: current governor `cat scaling_governor`."
-
-			if [ "`cat scaling_governor`" = "ondemand" ]
-			then
-				echo "${CPU}: governor already set to `cat scaling_governor`."
-			else
-				cat scaling_available_governors | grep -q "ondemand"
-
-				if [ "${?}" = "0" ]
-				then
-					echo "ondemand" > scaling_governor
-					echo "${CPU}: governor set to `cat scaling_governor`."
-				else
-					echo "E: unavailable governor ondemand."
-					exit 1
-				fi
-			fi
-		done
-		;;
-
-	use|userspace)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-
-			echo "${CPU}: current governor `cat scaling_governor`."
-
-			if [ "`cat scaling_governor`" = "userspace" ]
-			then
-				echo "${CPU}: governor already set to `cat scaling_governor`."
-			else
-				cat scaling_available_governors | grep -q "userspace"
-
-				if [ "${?}" = "0" ]
-				then
-					echo "userspace" > scaling_governor
-					echo "${CPU}: governor set to `cat scaling_governor`."
-				else
-					echo "E: unavailable governor userspace."
-					exit 1
-				fi
-			fi
-		done
-		;;
-
-	ava|available)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			echo "${CPU}: available frequencies: `cat scaling_available_frequencies`."
-			echo "${CPU}: available governors: `cat scaling_available_governors`."
-		done
-		;;
-
-	cur|current)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			echo "${CPU}: current frequency `cat scaling_cur_freq`kHz."
-
-			if [ "`cat scaling_cur_freq`" = "`cat scaling_max_freq`" ]
-			then
-				echo "${CPU}: frequency set to maximum."
-			elif [ "`cat scaling_cur_freq`" = "`cat scaling_min_freq`" ]
-			then
-				echo "${CPU}: frequency set to minimum."
-			fi
-		done
-		;;
-
-	man|manual)
-		if [ -z "${2}" ]
-		then
-			echo "E: no frequency specified."
-			exit 1
-		fi
-
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			cat scaling_available_frequencies | grep -q "${2}"
-
-			if [ "${?}" = "0" ]
-			then
-				echo "${CPU}: current frequency `cat scaling_cur_freq`kHz."
-
-				if [ "`cat scaling_cur_freq`" = ${2} ]
-				then
-					echo "${CPU}: frequency already set to `cat scaling_cur_freq`kHz."
-				else
-					if [ "`cat scaling_governor`" = "userspace" ]
-					then
-						echo "${2}" > scaling_setspeed
-						echo "${CPU}: frequency set to `cat scaling_cur_freq`kHz."
-					else
-						echo "E: wrong governor `cat scaling_governor`."
-						exit 1
-					fi
-				fi
-			else
-				echo "${CPU}: current frequency `cat scaling_cur_freq`kHz."
-				echo "E: unavailable frequency ${2}kHz."
-				exit 1
-			fi
-		done
-		;;
-
-	max|maximal)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			echo "${CPU}: current frequency `cat scaling_cur_freq`kHz."
-
-			if [ "`cat scaling_max_freq`" = "`cat scaling_cur_freq`" ]
-			then
-				echo "${CPU}: frequency already set to maximum."
-			else
-				if [ "`cat scaling_governor`" = "userspace" ]
-				then
-					cat scaling_max_freq > scaling_setspeed
-					echo "${CPU}: frequency set to `cat scaling_cur_freq`kHz."
-				else
-					echo "E: wrong governor `cat scaling_governor`."
-					exit 1
-				fi
-			fi
-		done
-		;;
-
-	min|minimal)
-		for CPU in cpu*
-		do
-			cd /sys/devices/system/cpu/"${CPU}"/cpufreq
-			echo "${CPU}: current frequency `cat scaling_cur_freq`kHz."
-
-			if [ "`cat scaling_min_freq`" = "`cat scaling_cur_freq`" ]
-			then
-				echo "${CPU}: frequency already set to minimum."
-			else
-				if [ "`cat scaling_governor`" = "userspace" ]
-				then
-					cat scaling_min_freq > scaling_setspeed
-					echo "${CPU}: frequency set to `cat scaling_cur_freq`kHz."
-				else
-					echo "E: wrong governor `cat scaling_governor`."
-					exit 1
-				fi
-			fi
-		done
-		;;
-esac
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/dgets b/desktop/config/chroot_local-includes/usr/local/bin/dgets
deleted file mode 100755
index a14fbcf..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/dgets
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-CURDIR="`pwd`"
-SOURCE="`basename ${1} | awk -F_ '{ print $1 }'`"
-
-mkdir NEW
-cd NEW
-dget ${1}
-prepare
-
-cd "${CURDIR}"
-
-mkdir OLD
-cd OLD
-apt-get source --download-only ${SOURCE}
-prepare
-
-cd "${CURDIR}"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/diffs b/desktop/config/chroot_local-includes/usr/local/bin/diffs
deleted file mode 100755
index 7ac8e15..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/diffs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-md5sum OLD/*.tar.gz NEW/*.tar.gz
-echo "pause..."
-read
-diff -Naurp OLD/*/ NEW/*/ > DIFF
-vi DIFF
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/diffs_debian b/desktop/config/chroot_local-includes/usr/local/bin/diffs_debian
deleted file mode 100755
index 6ae0359..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/diffs_debian
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-md5sum OLD/*.tar.gz NEW/*.tar.gz
-echo "pause..."
-read
-diff -Naurp OLD/*/debian NEW/*/debian > DIFF
-vi DIFF
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackage b/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackage
deleted file mode 100755
index 127be24..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackage
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/dpkg-buildpackage -rfakeroot -k4B2B2B9E ${@}
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackages b/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackages
deleted file mode 100755
index 20e640b..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/dpkg-buildpackages
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/dpkg-buildpackage -rfakeroot -k4B2B2B9E -sa ${@}
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/dputs b/desktop/config/chroot_local-includes/usr/local/bin/dputs
deleted file mode 100755
index 8aa41ec..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/dputs
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh
-
-# dputs.sh - Wrapper for dput(1)
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ] || [ -z "${1}" ]
-then
-	echo "dputs.sh - Wrapper for dput(1)"
-	echo
-	echo "Usage: `basename ${0}` DISTRIBUTION [SPONSOR]"
-	exit 1
-fi
-
-# Check configuration
-if [ ! -f ~/.dput.cf ] || [ "${1}" = "config" ]
-then
-
-cat >> ~/.dput.cf << EOF
-[backports]
-fqdn = www.backports.org
-incoming = /
-method = ftp
-login = anonymous
-
-[security-master]
-fqdn = security-master.debian.org
-incoming = /pub/SecurityUploadQueue/
-method = ftp
-login = anonymous
-
-[edu]
-fqdn = a.skolelinux.no
-incoming = /pub/UploadQueue/
-method = ftp
-login = anonymous
-EOF
-
-exit 0
-fi
-
-CODENAME_OLDSTABLE="sarge"
-CODENAME_STABLE="etch"
-CODENAME_TESTING="lenny"
-CODENAME_UNSTABLE="sid"
-
-DIRECTORY_CHROOT="/mnt/debian"
-
-DISTRIBUTION="${1}"
-SPONSOR="${2}"
-USER="user"
-
-if [ -z "${DISTRIBUTION}" ]
-then
-	DISTRIBUTION="unstable"
-fi
-
-case "${DISTRIBUTION}" in
-	oldstable-backports|"${CODENAME_OLDSTABLE}"-backports)
-		DISTRIBUTION="${CODENAME_OLDSTABLE}-backports"
-		;;
-
-	stable-backports|"${CODENAME_STABLE}"-backports)
-		DISTRIBUTION="${CODENAME_STABLE}-backports"
-		;;
-
-	stable-security|"${CODENAME_STABLE}"-security)
-		DISTRIBUTION="${CODENAME_STABLE}"
-		;;
-
-	stable-edu|"${CODENAME_STABLE}"-edu)
-		DISTRIBUTION="${CODENAME_STABLE}-edu"
-		;;
-
-	stable|"${CODENAME_STABLE}")
-		DISTRIBUTION="${CODENAME_STABLE}"
-		;;
-
-	testing|"${CODENAME_TESTING}")
-		DISTRIBUTION="${CODENAME_TESTING}"
-		;;
-
-	unstable|"${CODENAME_UNSTABLE}")
-		DISTRIBUTION="${CODENAME_UNSTABLE}"
-		;;
-esac
-
-if [ "${SPONSOR}" = "sponsor" ]
-then
-	CHROOT="${DIRECTORY_CHROOT}/${DISTRIBUTION}/home/${USER}/NEW"
-	NAME="`grep -e 'Changed-By:' ${CHROOT}/*.changes | sed -e 's/Changed-By: //' -e 's/ <.*//' -e 's/ /-/g' | tr A-Z a-z | sed -e 's/é/e/g' -e 's/ï/i/g' -e 's/ü/ue/g' -e 's/-(le_vert)//'`"
-else
-	CHROOT="${DIRECTORY_CHROOT}/${DISTRIBUTION}/home/${USER}"
-fi
-
-PACKAGE="`basename ${CHROOT}/*.dsc | awk -F_ '{ print $1 }'`"
-VERSION="`basename ${CHROOT}/*.dsc | awk -F_ '{ print $2 }' | sed -e 's/.dsc//'`"
-
-CURDIR="`pwd`"
-
-if [ -z "${NAME}" ] || [ "`basename ${CURDIR}`" = "${NAME}" ]
-then
-	mkdir -p "${PACKAGE}"/"${VERSION}"
-	cd "${PACKAGE}"/"${VERSION}"
-	mv "${CHROOT}"/* ./
-	md5sums
-else
-	mkdir -p "${NAME}"/"${PACKAGE}"/"${VERSION}"
-	cd "${NAME}"/"${PACKAGE}"/"${VERSION}"
-	mv "${CHROOT}"/* ./
-	md5sums
-fi
-
-case "${DISTRIBUTION}" in
-	"${CODENAME_OLDSTABLE}"-backports|"${CODENAME_STABLE}"-backports)
-		dput backports *.changes
-		;;
-
-	"${CODENAME_STABLE}"-security)
-		dput security-master *.changes
-		;;
-
-	"${CODENAME_STABLE}"-edu)
-		dput edu *.changes
-		;;
-
-	*)
-		dput ftp-master *.changes
-		;;
-esac
-
-rm -f *.upload
-chmod 0640 *.changes
-
-TARBALL="`ls *.tar.gz`"
-
-if [ -f ../upstream/"${TARBALL}" ]
-then
-	rm -f "${TARBALL}"
-	ln -s ../upstream/"${TARBALL}" ./
-else
-	if [ ! -d ../upstream ]
-	then
-		mkdir ../upstream
-	fi
-
-	mv "${TARBALL}" ../upstream
-	ln -s ../upstream/"${TARBALL}" ./
-	cd ../upstream && md5sums
-fi
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/gpg-decrypt b/desktop/config/chroot_local-includes/usr/local/bin/gpg-decrypt
deleted file mode 100755
index ad3fbf1..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/gpg-decrypt
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# gpg-decrypt.sh - Decrypt files (including filenames).
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# FIXME:
-# . ${RANDOM} is a bashism
-#
-# . autodetect secret key
-# . configure gpg options
-# . review gpg command calls
-#
-# . save/restore owner and permissions
-# . hide processing and show progressbar
-# . recursive?
-# . scale up and use better random ciphers
-
-Passphrase ()
-{
-	echo -n "  * Enter passphrase: "
-	read -s -t 60 PASSPHRASE
-	echo
-	echo
-
-	if [ -z "${PASSPHRASE}" ]
-	then
-		Passphrase
-	fi
-
-	trap "if [ ! -z ${PASSPHRASE} ]; then export PASSPHRASE=; fi; exit 0" 0 2 15
-}
-
-Decrypt ()
-{
-	for FILE in ${@}
-	do
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 --output "`basename ${FILE} .gpg`" --decrypt "${FILE}"
-
-		rm -f "${FILE}"
-	done
-
-	for FILE in *-control
-	do
-		sh "${FILE}"
-
-		rm -f "${FILE}"
-	done
-}
-
-Passphrase
-Decrypt "${@}"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/gpg-encrypt b/desktop/config/chroot_local-includes/usr/local/bin/gpg-encrypt
deleted file mode 100755
index 578ac84..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/gpg-encrypt
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# gpg-encrypt.sh - Encrypt files (including filenames).
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# FIXME:
-# . ${RANDOM} is a bashism
-#
-# . autodetect secret key
-# . configure gpg options
-# . review gpg command calls
-#
-# . save/restore owner and permissions
-# . hide processing and show progressbar
-# . recursive?
-# . scale up and use better random ciphers
-
-KEY="4B2B2B9E"
-COMPRESS_LEVEL="0"
-
-Key ()
-{
-	if [ -z "${KEY}" ]
-	then
-		echo -n "  * Enter key: "
-		read KEY
-
-		if [ -z "${KEY}" ]
-		then
-			Key
-		fi
-	fi
-}
-
-Passphrase ()
-{
-	echo -n "  * Enter passphrase: "
-	read -s -t 60 PASSPHRASE
-	echo
-	echo
-
-	if [ -z "${PASSPHRASE}" ]
-	then
-		Passphrase
-	fi
-
-	trap "if [ ! -z ${PASSPHRASE} ]; then export PASSPHRASE=; fi; exit 0" 0 2 15
-}
-
-Encrypt ()
-{
-	for OBJECT in ${@}
-	do
-		if [ -d "${OBJECT}" ]
-		then
-			Encrypt_directory "${OBJECT}";
-		elif [ -f "${OBJECT}" ]
-		then
-			Encrypt_file "${OBJECT}";
-		elif [ -h "${OBJECT}" ]
-		then
-			Encrypt_link "${OBJECT}";
-		else
-			echo "E: unknow/unsupported input type."
-			exit 1
-		fi
-	done
-}
-
-Encrypt_directory ()
-{
-	for DIRECTORY in ${1}
-	do
-		NAME="${RANDOM}"
-
-		if [ -d "${NAME}" ]
-		then
-			while [ -d "${NAME}" ]
-			do
-				NAME="${RANDOM}"
-			done
-		fi
-
-		echo "mv ${NAME} ${DIRECTORY}" > "${NAME}"-control
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 -z "${COMPRESS_LEVEL}" --encrypt --recipient "${KEY}" "${NAME}"-control
-
-		mv "${DIRECTORY}" "${NAME}"
-		rm -f "${NAME}"-control
-	done
-}
-
-Encrypt_file ()
-{
-	for FILE in ${1}
-	do
-		NAME="${RANDOM}"
-
-		if [ -f "${NAME}-control.gpg" ]
-		then
-			while [ -f "${NAME}-control.gpg" ]
-			do
-				NAME="${RANDOM}"
-			done
-		fi
-
-		echo "mv ${NAME}-data ${FILE}" > "${NAME}"-control
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 -z "${COMPRESS_LEVEL}" --sign --encrypt --recipient "${KEY}" "${NAME}"-control
-
-		mv "${FILE}" "${NAME}"-data
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 -z "${COMPRESS_LEVEL}" --encrypt --recipient "${KEY}" "${NAME}"-data
-
-		rm -f "${NAME}"-control "${NAME}"-data
-	done
-}
-
-Encrypt_link ()
-{
-	for LINK in ${1}
-	do
-		NAME="${RANDOM}"
-		SOURCE="`ls -al ${LINK} | awk {'print $10'}`"
-		TARGET="`ls -al ${LINK} | awk {'print $8'}`"
-
-		if [ -f "${NAME}-control.gpg" ]
-		then
-			while [ -f "${NAME}-control.gpg" ]
-			do
-				NAME="${RANDOM}"
-			done
-		fi
-
-		echo "ln -s ${SOURCE} ${TARGET}" > "${NAME}"-control
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 -z "${COMPRESS_LEVEL}" --encrypt --recipient "${KEY}" "${NAME}"-control
-
-		rm -f "${LINK}"
-		rm -f "${NAME}"-control
-	done
-}
-
-Key
-Passphrase
-Encrypt "${@}"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/gpg-sign b/desktop/config/chroot_local-includes/usr/local/bin/gpg-sign
deleted file mode 100755
index 7193933..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/gpg-sign
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-KEY="4B2B2B9E"
-COMPRESS_LEVEL="0"
-
-Key ()
-{
-	if [ -z "${KEY}" ]
-	then
-		echo -n "  * Enter key: "
-		read KEY
-
-		if [ -z "${KEY}" ]
-		then
-			Key
-		fi
-	fi
-}
-
-Passphrase ()
-{
-	echo -n "  * Enter passphrase: "
-	read -s -t 60 PASSPHRASE
-	echo
-	echo
-
-	if [ -z "${PASSPHRASE}" ]
-	then
-		Passphrase
-	fi
-
-	trap "if [ ! -z ${PASSPHRASE} ]; then export PASSPHRASE=; fi; exit 0" 0 2 15
-}
-
-Key
-Passphrase
-
-for FILE in "${@}"
-do
-	gpg --output "${FILE}.sign" -ba "${FILE}"
-done
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/halt b/desktop/config/chroot_local-includes/usr/local/bin/halt
deleted file mode 100755
index f14c53f..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/halt
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sudo sh -c "/sbin/halt"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/kqemu b/desktop/config/chroot_local-includes/usr/local/bin/kqemu
deleted file mode 100755
index a003e19..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/kqemu
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ] || [ -z "${1}" ]
-then
-	echo "kqemu.sh"
-	echo
-	echo "Usage: `basename ${0}` [IMAGE]"
-	exit 1
-fi
-
-QEMU_OPTIONS="-kernel-kqemu -m 512"
-
-case "`basename ${1} | awk -F. '{ print $2 }'`" in
-	img)
-		QEMU_OPTIONS="${QEMU_OPTIONS} -hda ${1}"
-		;;
-
-	iso)
-		QEMU_OPTIONS="${QEMU_OPTIONS} -cdrom ${1}"
-		;;
-esac
-
-qemu ${QEMU_OPTIONS}
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/md5sums b/desktop/config/chroot_local-includes/usr/local/bin/md5sums
deleted file mode 100755
index 5eeb39b..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/md5sums
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/sh
-
-# md5sums.sh - Generate signed MD5 message digests files
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-case "`basename ${0}`" in
-	md5sums|md5sums.sh)
-		DIGEST="MD5"
-		NAME="md5sums"
-		PROGRAM="md5sum"
-		;;
-
-	sha1sums|sha1sums.sh)
-		DIGEST="SHA1"
-		NAME="sha1sums"
-		PROGRAM="sha1sum"
-		;;
-
-	sha256sums|sha256sums.sh)
-		DIGEST="SHA256"
-		NAME="sha256sums"
-		PROGRAM="sha256sum"
-		;;
-esac
-
-Passphrase ()
-{
-	if [ -z "${PASSPHRASE}" ]
-	then
-		echo -n "  * Enter passphrase: "
-		read -s -t 60 PASSPHRASE
-		echo
-		echo
-	fi
-
-	if [ -z "${PASSPHRASE}" ]
-	then
-		Passphrase
-	fi
-
-	trap "if [ ! -z ${PASSPHRASE} ]; then export PASSPHRASE=; fi; exit 0" 0 2 15
-}
-
-Md5sum ()
-{
-	if [ -z "${PASSPHRASE}" ]
-	then
-		Passphrase
-	fi
-
-	# Remove old digests
-	rm -f ${DIGEST}SUM*
-
-	if [ ! -z "`ls`" ]
-	then
-		# Create digest
-		${PROGRAM} * > ${DIGEST}SUMS
-
-		# Sign digest
-		echo "${PASSPHRASE}" | gpg --quiet --passphrase-fd 0 --clearsign ${DIGEST}SUMS
-		mv -f ${DIGEST}SUMS.asc ${DIGEST}SUMS
-	fi
-}
-
-Md5check ()
-{
-	if [ -r ${DIGEST}SUMS ]
-	then
-		gpg --verify ${DIGEST}SUMS
-		${PROGRAM} -c ${DIGEST}SUMS
-	elif [ -f ${DIGEST}SUMS ]
-	then
-		echo "W: cannot read `pwd`/${DIGEST}SUMS: Permission denied."
-	fi
-}
-
-Main ()
-{
-	case "${1}" in
-		-c|--check)
-			Md5check
-			;;
-
-		-cc|--check-recursive)
-			for DIRECTORY in *
-			do
-				if [ -d "${DIRECTORY}" ]
-				then
-					cd "${DIRECTORY}"
-					Md5check
-					cd ..
-				fi
-			done
-			;;
-
-		-ccc|--check-double-recursive)
-			for PARENT_DIRECTORY in *
-			do
-				if [ -d "${PARENT_DIRECTORY}" ]
-				then
-					cd "${PARENT_DIRECTORY}"
-					"${0}" --check-recursive
-					cd ..
-					fi
-			done
-			;;
-
-		--clean)
-			find "`pwd`" -type f -name "${DIGEST}SUM*" | xargs rm -f
-			;;
-
-		--list)
-			find "`pwd`" -type f -name "${DIGEST}SUM*"
-			;;
-
-		-s|--sum)
-			Md5sum
-			;;
-
-		-ss|--sum-recursive)
-			for DIRECTORY in *
-			do
-				if [ -d "${DIRECTORY}" ]
-				then
-					cd "${DIRECTORY}"
-					Md5sum
-					cd ..
-				fi
-			done
-			;;
-
-		-sss|--sum-double-recursive)
-			for PARENT_DIRECTORY in *
-			do
-				if [ -d "${PARENT_DIRECTORY}" ]
-				then
-					cd "${PARENT_DIRECTORY}"
-
-					for DIRECTORY in *
-					do
-						if [ -d "${DIRECTORY}" ]
-						then
-							cd "${DIRECTORY}"
-							Md5sum
-							cd ..
-						fi
-					done
-
-					cd ..
-				fi
-			done
-			;;
-
-		-h|--help)
-			echo "${NAME} - Generate signed ${DIGEST} message digests files"
-			echo
-			echo "Usage: `basename ${0}` [-c|--check] [-cc|--recursive-check] [-ccc|--double-recursive-check]"
-			echo "Usage: `basename ${0}` [--clean] [--list]"
-			echo "Usage: `basename ${0}` [-s|--sum] [-ss|--sum-recursive] [-sss|--sum-double-recursive]"
-			exit 1
-			;;
-
-		*)
-			Md5sum
-			;;
-	esac
-}
-
-Main "${@}"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/prepare b/desktop/config/chroot_local-includes/usr/local/bin/prepare
deleted file mode 100755
index 7853fc5..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/prepare
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-tar xfz *.orig.tar.gz
-gunzip *.diff.gz
-cd */
-patch -Np1 -i ../*.diff
-rm -f ../*.diff
-chmod 755 debian/rules
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/pss b/desktop/config/chroot_local-includes/usr/local/bin/pss
deleted file mode 100755
index be6a220..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/pss
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# pss.sh - Greps through list of the current processes
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-GREP_OPTIONS="--color=auto -i"
-PS_OPTIONS="-eaf"
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ]
-then
-	echo "pss.sh - Greps through list of the current processes"
-	echo
-	echo "Usage: `basename ${0}` [GREP_PATTERN]"
-	exit 1
-fi
-
-# Process data
-ps "${PS_OPTIONS}" | grep -e "${1}"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/reboot b/desktop/config/chroot_local-includes/usr/local/bin/reboot
deleted file mode 100755
index 388bc2e..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/reboot
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sudo sh -c "/sbin/reboot"
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/sha1sums b/desktop/config/chroot_local-includes/usr/local/bin/sha1sums
deleted file mode 120000
index 0167adf..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/sha1sums
+++ /dev/null
@@ -1 +0,0 @@
-md5sums
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/sha256sums b/desktop/config/chroot_local-includes/usr/local/bin/sha256sums
deleted file mode 120000
index 0167adf..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/sha256sums
+++ /dev/null
@@ -1 +0,0 @@
-md5sums
\ No newline at end of file
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/suspend-disk b/desktop/config/chroot_local-includes/usr/local/bin/suspend-disk
deleted file mode 100755
index 4b626b9..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/suspend-disk
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -n "${DISPLAY}" ]
-then
-	slock &
-fi
-
-#sudo sh -c "echo 'disk' > /sys/power/state"
-sudo hibernate-disk
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/suspend-mem b/desktop/config/chroot_local-includes/usr/local/bin/suspend-mem
deleted file mode 100755
index 4792381..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/suspend-mem
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -n "${DISPLAY}" ]
-then
-	slock &
-fi
-
-#sudo sh -c "echo 'mem' > /sys/power/state"
-sudo hibernate-ram
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/svnexport b/desktop/config/chroot_local-includes/usr/local/bin/svnexport
deleted file mode 100755
index ad79a95..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/svnexport
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-for CONFIG in daniel/desktop daniel/test
-do
-	if [ -d /mnt/debian/devel/home/user/`echo ${CONFIG} | sed -e 's#/#-#'`/config ]
-	then
-		rm -rf /mnt/debian/devel/home/user/`echo ${CONFIG} | sed -e 's#/#-#'`/config
-	fi
-
-	if [ ! -d /mnt/debian/devel/home/user/`echo ${CONFIG} | sed -e 's#/#-#'` ]
-	then
-		mkdir -p /mnt/debian/devel/home/user/`echo ${CONFIG} | sed -e 's#/#-#'`
-	fi
-
-	svn export /srv/code/debian-live/configs/${CONFIG}/config /mnt/debian/devel/home/user/`echo ${CONFIG} | sed -e 's#/#-#'`/config
-done
-
-for PACKAGE in live-helper live-initramfs live-initscripts live-webhelper
-do
-	rm -rf /mnt/debian/devel/home/user/${PACKAGE}
-	svn export /srv/code/debian-live/dists/trunk/${PACKAGE} /mnt/debian/devel/home/user/${PACKAGE}
-done
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/vi-mtime b/desktop/config/chroot_local-includes/usr/local/bin/vi-mtime
deleted file mode 100755
index 6a40e0f..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/vi-mtime
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# vi-mtime.sh - Editing files without changing mtime
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# Show help
-if [ -z "${1}" ]
-then
-	echo "vi-mtime.sh - Editing files without changing mtime"
-	echo
-	echo "Usage: `basename ${0}` FILE"
-	exit 1
-fi
-
-# Saving mtime
-touch -r "${1}" ."${1}".mtime
-
-# Process file
-vi "${1}"
-
-# Restoring mtime
-touch -r ."${1}".mtime "${1}"
-rm -f ."${1}".mtime
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/vis b/desktop/config/chroot_local-includes/usr/local/bin/vis
deleted file mode 100755
index c6399b5..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/vis
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# vis.sh - Editing files recursively
-#
-# This script is written by Daniel Baumann <daniel at debian.org>
-# and hereby placed in the public domain (no rights reserved).
-
-set -e
-
-# Show help
-if [ "${1}" = "-h" ] || [ "${1}" = "--help}" ]
-then
-	echo "vis.sh - Editing files recursively"
-	echo
-	echo "Usage: `basename ${0}` [-r|--recursive]"
-	exit 1
-fi
-
-case "${1}" in
-	-r|--recursive)
-		find "`pwd`" -type f -exec vi {} \;
-		;;
-
-	*)
-		find "`pwd`" -maxdepth 1 -type f -exec vi {} \;
-		;;
-esac
diff --git a/desktop/config/chroot_local-includes/usr/local/bin/wodims b/desktop/config/chroot_local-includes/usr/local/bin/wodims
deleted file mode 100755
index 249d80f..0000000
--- a/desktop/config/chroot_local-includes/usr/local/bin/wodims
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-DEV="ATA:/dev/scd0"
-DRIVEROPTS="burnfree"
-SPEED="100"
-
-GENISOIMAGE="genisoimage -J -R"
-WODIM="wodim -v -dev=${DEV} -driveropts=${DRIVEROPTS} -speed=${SPEED}"
-
-case "${1}" in
-	audio)
-		${WODIM} -eject -dao -pad -audio "${2}"
-		;;
-
-	blank)
-		${WODIM} -eject -dao blank=fast
-		;;
-
-	data)
-		if [ -f "${2}" ]
-		then
-			${WODIM} -eject -dao -data "${2}"
-		elif [ -d "${2}" ]
-		then
-			${GENISOIMAGE} -o "${2}".iso "${2}"
-
-			${0} data "${2}".iso
-
-			rm -f "${2}".iso
-		fi
-		;;
-esac
diff --git a/desktop/config/chroot_local-packageslists/daniel b/desktop/config/chroot_local-packageslists/daniel
deleted file mode 100644
index 2f14372..0000000
--- a/desktop/config/chroot_local-packageslists/daniel
+++ /dev/null
@@ -1,42 +0,0 @@
-# /usr/share/make-live/lists/x11 - package list for make-live(1)
-
-# Minimal
-eject file sudo vim-tiny
-
-# Standard
-console-common kbd locales
-
-# X11
-xorg xresprobe
-
-################################################################################
-
-# Mozilla
-enigmail icedove iceweasel
-
-# WM
-dwm-tools unclutter wmii2 xloadimage xterm xtrlock
-
-# CD-ROM
-genisoimage wodim
-
-# Wireless
-firmware-ipw3945 ipw3945-modules-2.6-686 ipw3945d wireless-tools
-
-# Filesystems
-dosfstools e2fsprogs ext2resize hfsutils jfsutils ntfs-3g ntfsprogs
-reiser4progs reiserfsprogs ufsutils xfsprogs
-ddrescue sdd grub lilo gparted parted partimage
-
-# Network
-bmon curl dnsutils finger iftop iptraf irssi lynx mtr ncftp netcat nmap ntop
-ntpdate openssh-client rsync telnet-ssl tcpdump tcptraceroute traceroute
-tshark vpnc wget whois
-
-# Utilities
-bc bittorrent cvs gpm less screen strace subversion sudo vim
-
-# misc
-hdparm dmidecode procinfo pciutils usbutils hwinfo hwtools x86info cpuid
-testdisk
-clamav clamav-data wipe secure-delete minicom
diff --git a/desktop/config/chroot_sources/live-backports.binary b/desktop/config/chroot_sources/live-backports.binary
deleted file mode 100644
index 3c1a2c1..0000000
--- a/desktop/config/chroot_sources/live-backports.binary
+++ /dev/null
@@ -1,11 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Etch backports repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-backports.bootstrap and once as live-backports.binary.
-##
-## Remeber to add debian-unofficial-archive-keyring to your package selection.
-
-# Debian Live backports for Etch
-deb http://live.debian.net/debian/ etch main
-deb-src http://live.debian.net/debian/ etch main
diff --git a/desktop/config/chroot_sources/live-backports.binary.gpg b/desktop/config/chroot_sources/live-backports.binary.gpg
deleted file mode 100644
index 64a0a1b..0000000
--- a/desktop/config/chroot_sources/live-backports.binary.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEW3mTQRBACGTYsPYYtzKpjTBcuDOMyF48fcNkW069tXst8/aS1SM4Elw7j4
-sdkwTc6PCV1WBJuZObEAmsGJRyWfMVniux6HJiEjZLehyzfGPHjPaqnPeHomoTa2
-EpKT0AtqhUW2RVsGSPcx5E0w+71GOd4Rl1Dxc3kS0wqHYHfzcPsDq4xn1wCg2oV5
-oyuxyI3W4ep0uFDe1X0Du7kD/0TrkT9hsinfCga9vJ+R1Yslz9fEvRm1WvdTUW3k
-rEJs3gVIuNMF4a9SikXkBngquQA4iuj/rghFkBKexEZm52a486vZgkR5q0BD8+c/
-Ua6plRNQPdUMusymWHXnPw8Hxyt/+g21U3eCSIcktSR8kX1+dsp5MKw+Dh6wdRSb
-FOsVA/9BS4ANC0S02UzbR4Qsxutde0P0+2hUJJCfB1877p6W2vWp2UVQu11YLIfM
-sgYJjUAlMVcBFBJI1BHkK0vx2xK4w3/s9RiFa2aeY+ZGfoA6qLeKXbHHUEvj37c/
-k9Gh6MqgxUHE21X5z8GuHPRbiL+kZJt59DL5EwO+viWuEVuUZLRYRGViaWFuIFVu
-b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDcpIDxm
-dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJFt5k0AhsD
-BQkB67+ABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQOU0ZlSTFKsOXdQCfeRoG
-HjLLQmYPM8iP1/7WyEY9uaEAnApx8isAZY0rlL13vx++lPF+M9reiEYEEBECAAYF
-AkW3mU8ACgkQ+C5cwEsrK56jCQCghT9KL/I1G6nUw+9bYr1qjQWVDzgAn3KUtyE/
-uc4k+zApv632x2susVIq
-=BzDd
------END PGP PUBLIC KEY BLOCK-----
diff --git a/desktop/config/chroot_sources/live-backports.bootstrap b/desktop/config/chroot_sources/live-backports.bootstrap
deleted file mode 100644
index 3c1a2c1..0000000
--- a/desktop/config/chroot_sources/live-backports.bootstrap
+++ /dev/null
@@ -1,11 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Etch backports repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-backports.bootstrap and once as live-backports.binary.
-##
-## Remeber to add debian-unofficial-archive-keyring to your package selection.
-
-# Debian Live backports for Etch
-deb http://live.debian.net/debian/ etch main
-deb-src http://live.debian.net/debian/ etch main
diff --git a/desktop/config/chroot_sources/live-backports.bootstrap.gpg b/desktop/config/chroot_sources/live-backports.bootstrap.gpg
deleted file mode 100644
index 64a0a1b..0000000
--- a/desktop/config/chroot_sources/live-backports.bootstrap.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEW3mTQRBACGTYsPYYtzKpjTBcuDOMyF48fcNkW069tXst8/aS1SM4Elw7j4
-sdkwTc6PCV1WBJuZObEAmsGJRyWfMVniux6HJiEjZLehyzfGPHjPaqnPeHomoTa2
-EpKT0AtqhUW2RVsGSPcx5E0w+71GOd4Rl1Dxc3kS0wqHYHfzcPsDq4xn1wCg2oV5
-oyuxyI3W4ep0uFDe1X0Du7kD/0TrkT9hsinfCga9vJ+R1Yslz9fEvRm1WvdTUW3k
-rEJs3gVIuNMF4a9SikXkBngquQA4iuj/rghFkBKexEZm52a486vZgkR5q0BD8+c/
-Ua6plRNQPdUMusymWHXnPw8Hxyt/+g21U3eCSIcktSR8kX1+dsp5MKw+Dh6wdRSb
-FOsVA/9BS4ANC0S02UzbR4Qsxutde0P0+2hUJJCfB1877p6W2vWp2UVQu11YLIfM
-sgYJjUAlMVcBFBJI1BHkK0vx2xK4w3/s9RiFa2aeY+ZGfoA6qLeKXbHHUEvj37c/
-k9Gh6MqgxUHE21X5z8GuHPRbiL+kZJt59DL5EwO+viWuEVuUZLRYRGViaWFuIFVu
-b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDcpIDxm
-dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJFt5k0AhsD
-BQkB67+ABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQOU0ZlSTFKsOXdQCfeRoG
-HjLLQmYPM8iP1/7WyEY9uaEAnApx8isAZY0rlL13vx++lPF+M9reiEYEEBECAAYF
-AkW3mU8ACgkQ+C5cwEsrK56jCQCghT9KL/I1G6nUw+9bYr1qjQWVDzgAn3KUtyE/
-uc4k+zApv632x2susVIq
-=BzDd
------END PGP PUBLIC KEY BLOCK-----
diff --git a/desktop/config/common b/desktop/config/common
deleted file mode 100644
index e6a3c91..0000000
--- a/desktop/config/common
+++ /dev/null
@@ -1,111 +0,0 @@
-# config/common - common options for live-helper(7)
-
-# $LH_APT: set package manager
-# (Default: aptitude)
-LH_APT="aptitude"
-
-# $LH_APT_FTPPROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTPPROXY=""
-
-# $LH_APT_HTTPPROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTPPROXY=""
-
-# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: enabled)
-LH_APT_PDIFFS="enabled"
-
-# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: enabled)
-LH_APT_RECOMMENDS="disabled"
-
-# $LH_APT_SECURE: set apt/aptitude security
-# (Default: enabled)
-LH_APT_SECURE="enabled"
-
-# $LH_BOOTSTRAP: set bootstrap program
-# (Default: cdebootstrap)
-LH_BOOTSTRAP="cdebootstrap"
-
-# $LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: disabled)
-LH_CACHE_INDICES="disabled"
-
-# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: enabled)
-LH_CACHE_PACKAGES="disabled"
-
-# $LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: bootstrap)
-LH_CACHE_STAGES="bootstrap"
-
-# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: noninteractive)
-LH_DEBCONF_FRONTEND="noninteractive"
-
-# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: yes)
-LH_DEBCONF_NOWARNINGS="yes"
-
-# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: critical)
-LH_DEBCONF_PRIORITY="critical"
-
-# $LH_GENISOIMAGE: set genisoimage program
-# (Default: genisoimage)
-LH_GENISOIMAGE="genisoimage"
-
-# $LH_INITRAMFS: set initramfs hook
-# (Default: live-initramfs)
-LH_INITRAMFS="live-initramfs"
-
-# $LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="losetup"
-
-# $LH_MODE: set distribution mode
-# (Default: debian)
-LH_MODE="debian"
-
-# $LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# $LH_TASKSEL: set tasksel program
-# (Default: aptitude)
-LH_TASKSEL="aptitude"
-
-# $LH_ROOT: set root directory
-# (Default: debian-live)
-LH_ROOT="debian-live"
-
-# $LH_INCLUDES: set includes
-# (Default: /usr/share/live-helper/includes)
-LH_INCLUDES="/usr/share/live-helper/includes"
-
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-LH_TEMPLATES="/usr/share/live-helper/templates"
-
-# Live-helper options
-
-# $LH_BREAKPOINTS: enable breakpoints
-# (Default: disabled)
-#LH_BREAKPOINTS="disabled"
-
-# $LH_DEBUG: enable debug
-# (Default: disabled)
-#LH_DEBUG="disabled"
-
-# $LH_FORCE: enable force
-# (Default: disabled)
-#LH_FORCE="disabled"
-
-# $LH_QUIET: enable quiet
-# (Default: disabled)
-#LH_QUIET="disabled"
-
-# $LH_VERBOSE: enable verbose
-# (Default: disabled)
-#LH_VERBOSE="disabled"
diff --git a/desktop/config/source b/desktop/config/source
deleted file mode 100644
index 35dc713..0000000
--- a/desktop/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-helper(7), source stage
-
-# $LH_SOURCE: set source option
-# (Default: disabled)
-LH_SOURCE="enabled"
-
-# $LH_SOURCE_IMAGES: set image type
-# (Default: tar)
-LH_SOURCE_IMAGES="tar"
diff --git a/purge.sh b/purge.sh
new file mode 100755
index 0000000..72a39dd
--- /dev/null
+++ b/purge.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./clean.sh
+
+lh_clean --purge
diff --git a/test/config/binary b/test/config/binary
deleted file mode 100644
index 3bf8fd9..0000000
--- a/test/config/binary
+++ /dev/null
@@ -1,74 +0,0 @@
-# config/binary - options for live-helper(7), binary stage
-
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-LH_BINARY_IMAGES="iso"
-
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-LH_BINARY_INDICES="disabled"
-
-# $LH_BOOTAPPEND: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND=""
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LH_BOOTLOADER="syslinux"
-
-# $LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LH_CHROOT_BUILD="disabled"
-
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LH_DEBIAN_INSTALLER="disabled"
-
-# $LH_ENCRYPTION: set encrytion
-# (Default: empty)
-LH_ENCRYPTION=""
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: debian)
-LH_HOSTNAME="debian"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Debian Live"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a12; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper ${VERSION}; http://packages.qa.debian.org/live-helper"
-
-# $LH_ISO_PUBLISHER: set iso preparer
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
-
-# $LH_ISO_VOLUME: set iso volume
-# (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LH_ISO_VOLUME="Debian Live `date +%Y%m%d-%H:%M`"
-
-# $LH_MEMTEST: set memtest
-# (Default: memtest86+)
-LH_MEMTEST="memtest86+"
-
-# $LH_NET_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LH_NET_PATH="/srv/debian-live"
-
-# $LH_NET_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-LH_NET_SERVER="192.168.1.1"
-
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LH_SYSLINUX_SPLASH=""
-
-# $LH_USERNAME: set username
-# (Default: user)
-LH_USERNAME="user"
diff --git a/test/config/bootstrap b/test/config/bootstrap
deleted file mode 100644
index 71cd871..0000000
--- a/test/config/bootstrap
+++ /dev/null
@@ -1,37 +0,0 @@
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# $LH_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LH_ARCHITECTURE="i386"
-
-# $LH_DISTRIBUTION: select distribution to use
-# (Default: etch)
-LH_DISTRIBUTION="lenny"
-
-# $LH_DISTRIBUTION_CONFIG: set distribution config directory
-# (Default: empty)
-LH_DISTRIBUTION_CONFIG=""
-
-# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: standard)
-LH_BOOTSTRAP_FLAVOUR="standard"
-
-# $LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
-# (Default: http://ftp.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://10.0.0.11/ftp.debian.org/debian/"
-
-# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
-# (Default: http://security.debian.org/)
-LH_MIRROR_BOOTSTRAP_SECURITY="http://10.0.0.11/ftp.debian.org/debian-security/"
-
-# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://ftp.debian.org/debian/)
-LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
-
-# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: http://security.debian.org/)
-LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
-
-# $LH_SECTIONS: select section(s) to use
-# (Default: main)
-LH_SECTIONS="main contrib non-free"
diff --git a/test/config/chroot b/test/config/chroot
deleted file mode 100644
index a8066fd..0000000
--- a/test/config/chroot
+++ /dev/null
@@ -1,53 +0,0 @@
-# config/chroot - options for live-helper(7), chroot stage
-
-# $LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
-
-# $LH_HOOKS: set hook commands
-# (Default: empty)
-LH_HOOKS=""
-
-# $LH_INTERACTIVE: set interactive build
-# (Default: disabled)
-LH_INTERACTIVE="disabled"
-
-# $LH_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LH_KEYRING_PACKAGES=""
-
-# $LH_LANGUAGE: set language to use
-# (Default: empty)
-LH_LANGUAGE=""
-
-# $LH_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LH_LINUX_FLAVOURS="686"
-
-# $LH_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
-
-# $LH_PACKAGES: set packages to install
-# (Default: empty)
-LH_PACKAGES="live-initscripts"
-
-# $LH_PACKAGES_LISTS: set package list to install
-# (Default: standard)
-LH_PACKAGES_LISTS="standard"
-
-# $LH_TASKS: set tasks to install
-# (Default: empty)
-LH_TASKS=""
-
-# $LH_SECURITY: enable security updates
-# (Default: enabled)
-LH_SECURITY="disabled"
-
-# $LH_SYMLINKS: enable symlink convertion
-# (Default: disabled)
-LH_SYMLINKS="disabled"
-
-# $LH_SYSVINIT: enable sysvinit
-# (Default: disabled)
-LH_SYSVINIT="disabled"
diff --git a/test/config/chroot_sources/live-snapshots.binary b/test/config/chroot_sources/live-snapshots.binary
deleted file mode 100644
index 2842404..0000000
--- a/test/config/chroot_sources/live-snapshots.binary
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Snapshots repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-snapshots.bootstrap and once as live-snapshots.binary.
-
-# Debian Live Snapshots
-deb http://live.debian.net/debian-snapshots/ ./
-deb-src http://live.debian.net/debian-snapshots/ ./
diff --git a/test/config/chroot_sources/live-snapshots.bootstrap b/test/config/chroot_sources/live-snapshots.bootstrap
deleted file mode 100644
index 2842404..0000000
--- a/test/config/chroot_sources/live-snapshots.bootstrap
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Snapshots repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-snapshots.bootstrap and once as live-snapshots.binary.
-
-# Debian Live Snapshots
-deb http://live.debian.net/debian-snapshots/ ./
-deb-src http://live.debian.net/debian-snapshots/ ./
diff --git a/test/config/common b/test/config/common
deleted file mode 100644
index e6a3c91..0000000
--- a/test/config/common
+++ /dev/null
@@ -1,111 +0,0 @@
-# config/common - common options for live-helper(7)
-
-# $LH_APT: set package manager
-# (Default: aptitude)
-LH_APT="aptitude"
-
-# $LH_APT_FTPPROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTPPROXY=""
-
-# $LH_APT_HTTPPROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTPPROXY=""
-
-# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: enabled)
-LH_APT_PDIFFS="enabled"
-
-# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: enabled)
-LH_APT_RECOMMENDS="disabled"
-
-# $LH_APT_SECURE: set apt/aptitude security
-# (Default: enabled)
-LH_APT_SECURE="enabled"
-
-# $LH_BOOTSTRAP: set bootstrap program
-# (Default: cdebootstrap)
-LH_BOOTSTRAP="cdebootstrap"
-
-# $LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: disabled)
-LH_CACHE_INDICES="disabled"
-
-# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: enabled)
-LH_CACHE_PACKAGES="disabled"
-
-# $LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: bootstrap)
-LH_CACHE_STAGES="bootstrap"
-
-# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: noninteractive)
-LH_DEBCONF_FRONTEND="noninteractive"
-
-# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: yes)
-LH_DEBCONF_NOWARNINGS="yes"
-
-# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: critical)
-LH_DEBCONF_PRIORITY="critical"
-
-# $LH_GENISOIMAGE: set genisoimage program
-# (Default: genisoimage)
-LH_GENISOIMAGE="genisoimage"
-
-# $LH_INITRAMFS: set initramfs hook
-# (Default: live-initramfs)
-LH_INITRAMFS="live-initramfs"
-
-# $LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="losetup"
-
-# $LH_MODE: set distribution mode
-# (Default: debian)
-LH_MODE="debian"
-
-# $LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# $LH_TASKSEL: set tasksel program
-# (Default: aptitude)
-LH_TASKSEL="aptitude"
-
-# $LH_ROOT: set root directory
-# (Default: debian-live)
-LH_ROOT="debian-live"
-
-# $LH_INCLUDES: set includes
-# (Default: /usr/share/live-helper/includes)
-LH_INCLUDES="/usr/share/live-helper/includes"
-
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-LH_TEMPLATES="/usr/share/live-helper/templates"
-
-# Live-helper options
-
-# $LH_BREAKPOINTS: enable breakpoints
-# (Default: disabled)
-#LH_BREAKPOINTS="disabled"
-
-# $LH_DEBUG: enable debug
-# (Default: disabled)
-#LH_DEBUG="disabled"
-
-# $LH_FORCE: enable force
-# (Default: disabled)
-#LH_FORCE="disabled"
-
-# $LH_QUIET: enable quiet
-# (Default: disabled)
-#LH_QUIET="disabled"
-
-# $LH_VERBOSE: enable verbose
-# (Default: disabled)
-#LH_VERBOSE="disabled"
diff --git a/test/config/source b/test/config/source
deleted file mode 100644
index 1ac0ea6..0000000
--- a/test/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-helper(7), source stage
-
-# $LH_SOURCE: set source option
-# (Default: disabled)
-LH_SOURCE="disabled"
-
-# $LH_SOURCE_IMAGES: set image type
-# (Default: tar)
-LH_SOURCE_IMAGES="tar"

-- 
debian-live/config-daniel



More information about the debian-live-changes mailing list