6 files changed, 60 insertions, 31 deletions
diff --git a/auto/config b/auto/config
index 97eb577..be5c30b 100755
--- a/auto/config
+++ b/auto/config
@@ -27,6 +27,13 @@ if test "$MIRROR_BOOTSTRAP" = -; then
 	MIRROR_BOOTSTRAP="$DEFAULT_CHROOT"
 fi
 
+# kernel
+lh config noauto \
+#        --linux-flavours generic \
+#        --linux-packages "linux-image-2.6.32-21 linux-headers-2.6.32-21"
+        --linux-flavours 686-bigmem \
+        --linux-packages "linux-headers-2.6-686-bigmem"
+
 lh config noauto \
 	--iso-volume KANOTIX \
 	--iso-preparer kanotix.com \
@@ -35,15 +42,13 @@ lh config noauto \
 	--username kanotix \
 	--chroot-filesystem squashfs \
 	--debian-installer false \
-	--linux-flavours generic \
-	--linux-packages "linux-image-2.6.32-21 linux-headers-2.6.32-21" \
 	--apt aptitude \
 	--apt-recommends false \
-	--bootappend-live 'quiet vga=791 live-config.utc=no live-config.timezone=Europe/Berlin live-config.locales=de keyb=de-latin1-nodeadkeys klayout=de kvariant=nodeadkeys' \
+	--bootappend-live 'quiet live-config.utc=no live-config.timezone=Europe/Berlin live-config.locales=de live-config.keyboard-layouts=de live-config.keyboard-variant=nodeadkeys keyb=de-latin1-nodeadkeys klayout=de kvariant=nodeadkeys' \
 	--distribution squeeze \
         --archive-areas "main contrib non-free" \
-	--repositories "live.debian.net acritox excalibur" \
-	--security false \
+	--repositories "live.debian.net acritox excalibur hellfire" \
+	--security true \
 	--checksums md5 \
 	--bootloader syslinux \
 	--syslinux-timeout 5 \
diff --git a/config/chroot_local-packageslists/firmware.list b/config/chroot_local-packageslists/firmware.list
new file mode 100644
index 0000000..b14a864
--- /dev/null
+++ b/config/chroot_local-packageslists/firmware.list
@@ -0,0 +1,13 @@
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-intelwimax
+firmware-ipw2x00
+firmware-ivtv
+firmware-iwlwifi
+firmware-linux
+firmware-linux-free
+firmware-linux-nonfree
+firmware-qlogic
+firmware-ralink
+firmware-realtek
diff --git a/config/chroot_local-packageslists/kanotix.list b/config/chroot_local-packageslists/kanotix.list
index 0b97c91..d50d121 100644
--- a/config/chroot_local-packageslists/kanotix.list
+++ b/config/chroot_local-packageslists/kanotix.list
@@ -1,3 +1,4 @@
+console-common
 unrar
 unzip
 zip
@@ -18,7 +19,6 @@ libk3b3-extracodecs
 normalize-audio
 dvd+rw-tools
 pidgin
-libpurple-bin
 gstreamer0.10-plugins-base
 gstreamer0.10-plugins-good
 debconf-utils
@@ -38,7 +38,6 @@ kpartx
 dosfstools
 lvm2
 parted
-cryptsetup
 os-prober
 mbr
 mdadm
@@ -46,7 +45,6 @@ hfsplus
 hfsutils
 jfsutils
 xfsprogs
-linux-firmware
 ndiswrapper-utils-1.9
 libv4l-0
 lib32v4l-0
@@ -56,28 +54,16 @@ xsane
 libsane-extras
 sane-utils
 sane
-gwenview-i18n
+gwenview
 infobash
 sysv-freeze
 kanotix-menu
 etcskel-kanotix
 user-profile-kanotix
-kanotix64-graphics
-grub2-splashimage-kanotix64-penguins
+kanotix-graphics
+grub2-splashimage-kanotix-penguins
 kanotix-scripts
 kanotix-toolkit
-rebuildfstab-kanotix
-hwsetup-ng
-xf86config-kanotix
-kanotix-screenres
-avm-firmware
-dwl520e1-firmware
-netcardconfig-kanotix
-kanotix-dsl
-kanotix-isdn
-gprsconnect-kanotix
-modemlink-kanotix
-hal
 kdebase
 kdm
 kde-i18n-de
@@ -105,7 +91,6 @@ bluez-audio
 ethtool
 vpnc
 openvpn
-cups-pdf
 cups-bsd
 cups-client
 foomatic-db-engine
@@ -116,7 +101,6 @@ cups-driver-gutenprint
 foo2zjs
 printconf
 hplip-gui
-phoronix-test-suite-gui
 skype
 pidgin-skype
 gtk2-engines
@@ -168,10 +152,34 @@ kghostview
 kcalc
 kuser
 screentube
-kdebluetooth
-umtsmon
+bluedevil
 kppp
-wicd
-koffice
-koffice-i18n-de
-openthesaurus-de-kword
+network-manager-kde
+openoffice.org-calc openoffice.org-common openoffice.org-core openoffice.org-draw openoffice.org-impress openoffice.org-java-common openoffice.org-kde openoffice.org-math openoffice.org-writer
+openoffice.org-l10n-de
+openoffice.org-thesaurus-de
+myspell-de-de
+bluez
+bluez-compat
+ndiswrapper-utils-1.9
+pm-utils
+vbetool
+radeontool
+modemmanager
+umtsmon
+okular
+synaptic
+konqueror-nsplugins
+kate
+wine-gecko
+time
+kde-config-touchpad
+
+#extra
+kde-config-gtk-style
+dvdauthor
+
+#installer
+
+cryptsetup
+debconf-utils
diff --git a/config/chroot_local-preseed/firmware-ipw2x00.cfg b/config/chroot_local-preseed/firmware-ipw2x00.cfg
new file mode 100644
index 0000000..4c2931b
--- /dev/null
+++ b/config/chroot_local-preseed/firmware-ipw2x00.cfg
@@ -0,0 +1 @@
+firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
diff --git a/config/chroot_local-preseed/firmware-ivtv.cfg b/config/chroot_local-preseed/firmware-ivtv.cfg
new file mode 100644
index 0000000..c11f779
--- /dev/null
+++ b/config/chroot_local-preseed/firmware-ivtv.cfg
@@ -0,0 +1 @@
+firmware-ivtv firmware-ivtv/license/accepted boolean true
diff --git a/config/chroot_local-preseed/keyboard-configuration.cfg b/config/chroot_local-preseed/keyboard-configuration.cfg
new file mode 100644
index 0000000..5386659
--- /dev/null
+++ b/config/chroot_local-preseed/keyboard-configuration.cfg
@@ -0,0 +1 @@
+keyboard-configuration keyboard-configuration/ctrl_alt_bksp boolean true