From eb08e15232803c6229f71d805cc749582a714685 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 4 Mar 2010 12:19:29 +0100
Subject: [PATCH] SW: Update to grml kernel 2.6.33.

---
 docs/grml-live.txt                             |  2 +
 etc/grml/fai/config/package_config/GRML_FULL   | 71 ++++++++++++--------------
 etc/grml/fai/config/package_config/GRML_MEDIUM | 14 ++---
 etc/grml/fai/config/package_config/GRML_SMALL  |  5 +-
 4 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 0874fdd..33a8267 100644
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -532,6 +532,7 @@ ZLIB compression. Just use the defaults for enabling LZMA or use grml-live's
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work
 * Kernel 2.6.31-grml[64]: works
+* Kernel 2.6.33-grml[64]: works
 
 [NOTE]
 
@@ -559,6 +560,7 @@ Grml's squashfs-lzma-tools (see section above) instead.
 * Kernel 2.6.26-grml[64]: does not work
 * Kernel 2.6.28-grml[64]: does not work
 * Kernel 2.6.31-grml[64]: works
+* Kernel 2.6.33-grml[64]: works
 
 [NOTE]
 Please use squashfs-tools >=1:4.0-1 only if you want to remaster grml releases
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 726add3..b540315 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1877,26 +1877,23 @@ grml
 # use linux-kernel-headers-grml instead of linux-libc-dev?
 # linux-kernel-headers-grml
 
-## current kernel version 2.6.31-grml:
-aufs-modules-2.6.31-grml
-drbd8-2.6.31-grml
-#fglrx-kernel-2.6.31-grml
-iscsitarget-module-2.6.31-grml
-kqemu-modules-2.6.31-grml
-linux-doc-2.6.31-grml
-linux-headers-2.6.31-grml
-linux-image-2.6.31-grml
-#linux-source-2.6.31-grml
-loop-aes-modules-2.6.31-grml
-ndiswrapper-modules-2.6.31-grml
-#nvidia-kernel-2.6.31-grml
-openafs-modules-2.6.31-grml
-sl-modem-modules-2.6.31-grml
-speakup-modules-2.6.31-grml
-sysprof-module-2.6.31-grml
-tp-smapi-modules-2.6.31-grml
-virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.31-grml
+## current kernel version 2.6.33-grml:
+drbd8-2.6.33-grml
+#fglrx-kernel-2.6.33-grml
+iscsitarget-module-2.6.33-grml
+linux-doc-2.6.33-grml
+linux-headers-2.6.33-grml
+linux-image-2.6.33-grml
+#linux-source-2.6.33-grml
+loop-aes-modules-2.6.33-grml
+ndiswrapper-modules-2.6.33-grml
+#nvidia-kernel-2.6.33-grml
+openafs-modules-2.6.33-grml
+speakup-modules-2.6.33-grml
+sysprof-module-2.6.33-grml
+tp-smapi-modules-2.6.33-grml
+virtualbox-ose-guest-modules-2.6.33-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.33-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -1905,24 +1902,22 @@ PACKAGES aptitude AMD64
 ## general:
 grml64
 
-## current kernel version 2.6.31-grml64:
-aufs-modules-2.6.31-grml64
-drbd8-2.6.31-grml64
-#fglrx-kernel-2.6.31-grml64
-iscsitarget-module-2.6.31-grml64
-kqemu-modules-2.6.31-grml64
-linux-doc-2.6.31-grml64
-linux-headers-2.6.31-grml64
-linux-image-2.6.31-grml64
-#linux-source-2.6.31-grml
-loop-aes-modules-2.6.31-grml64
-ndiswrapper-modules-2.6.31-grml64
-#nvidia-kernel-2.6.31-grml64
-openafs-modules-2.6.31-grml64
-speakup-modules-2.6.31-grml64
-sysprof-module-2.6.31-grml64
-xtables-addons-modules-2.6.31-grml64
-#virtualbox-ose-guest-modules-2.6.31-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 2.6.33-grml64:
+drbd8-2.6.33-grml64
+#fglrx-kernel-2.6.33-grml64
+iscsitarget-module-2.6.33-grml64
+linux-doc-2.6.33-grml64
+linux-headers-2.6.33-grml64
+linux-image-2.6.33-grml64
+#linux-source-2.6.33-grml
+loop-aes-modules-2.6.33-grml64
+ndiswrapper-modules-2.6.33-grml64
+#nvidia-kernel-2.6.33-grml64
+openafs-modules-2.6.33-grml64
+speakup-modules-2.6.33-grml64
+sysprof-module-2.6.33-grml64
+xtables-addons-modules-2.6.33-grml64
+#virtualbox-ose-guest-modules-2.6.33-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index deb6050..3e3e9f0 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -236,15 +236,11 @@ PACKAGES aptitude I386
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
-aufs-modules-2.6.31-grml
-linux-image-2.6.31-grml
-#madwifi-modules-2.6.31-grml madwifi-tools
+linux-image-2.6.33-grml
+#madwifi-modules-2.6.33-grml madwifi-tools
 powernowd
-#truecrypt-2.6.31-grml
-virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+virtualbox-ose-guest-modules-2.6.33-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 
 PACKAGES aptitude AMD64
-aufs-modules-2.6.31-grml64
-linux-image-2.6.31-grml64
-#madwifi-modules-2.6.31-grml64 madwifi-tools
-#truecrypt-2.6.31-grml64
+linux-image-2.6.33-grml64
+#madwifi-modules-2.6.33-grml64 madwifi-tools
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 9e660b5..4a66180 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -132,8 +132,7 @@ zoo
 zsh
 
 PACKAGES aptitude I386
-linux-image-2.6.31-grml aufs-modules-2.6.31-grml
-#linux-image-2.6.20-grml-small aufs-modules-2.6.20-grml-small
+linux-image-2.6.33-grml
 
 PACKAGES aptitude AMD64
-linux-image-2.6.31-grml64 aufs-modules-2.6.31-grml64
+linux-image-2.6.33-grml64
-- 
2.1.4