From: Michael Prokop <mika@grml.org>
Date: Mon, 7 Sep 2009 23:51:27 +0000 (+0200)
Subject: Update to kernel 2.6.31-grml[64]
X-Git-Tag: v0.9.23~39
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=045b6fb0cf1d8f368c07929d1d304ebc7a60cbd4

Update to kernel 2.6.31-grml[64]
---

diff --git a/debian/changelog b/debian/changelog
index aec3bb5..1d58973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ grml-live (0.9.23) UNRELEASED; urgency=low
   * Add backwards compability check for old sources.list layout
     (we're using /etc/apt/sources.list.d now) to script
     /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+  * GRML_SMALL, GRML_MEDIUM and GRML_FULL: switch from kernel
+    2.6.28-grml[64] to 2.6.31-grml[64].
 
- -- Michael Prokop <mika@grml.org>  Mon, 07 Sep 2009 20:24:12 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 08 Sep 2009 01:50:59 +0200
 
 grml-live (0.9.22) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index f1744c8..54bc239 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1971,28 +1971,28 @@ grml
 # use linux-kernel-headers-grml instead of linux-libc-dev?
 # linux-kernel-headers-grml
 
-## current kernel version 2.6.28-grml:
-aufs-modules-2.6.28-grml
-drbd8-2.6.28-grml
-#fglrx-kernel-2.6.28-grml
-iscsitarget-module-2.6.28-grml
-kqemu-modules-2.6.28-grml
-linux-doc-2.6.28-grml
-linux-headers-2.6.28-grml
-linux-image-2.6.28-grml
-#linux-source-2.6.28-grml
-loop-aes-modules-2.6.28-grml
-ndiswrapper-modules-2.6.28-grml
-#nvidia-kernel-2.6.28-grml
-openafs-modules-2.6.28-grml
-rt2400-modules-2.6.28-grml
-rt73-modules-2.6.28-grml
-sl-modem-modules-2.6.28-grml
-speakup-modules-2.6.28-grml
-sysprof-module-2.6.28-grml
-tp-smapi-modules-2.6.28-grml
-virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.28-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
+rt2400-modules-2.6.31-grml
+rt73-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
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2001,24 +2001,24 @@ PACKAGES aptitude AMD64
 ## general:
 grml64
 
-## current kernel version 2.6.28-grml64:
-aufs-modules-2.6.28-grml64
-drbd8-2.6.28-grml64
-#fglrx-kernel-2.6.28-grml64
-kqemu-modules-2.6.28-grml64
-linux-doc-2.6.28-grml64
-linux-headers-2.6.28-grml64
-linux-image-2.6.28-grml64
-#linux-source-2.6.28-grml
-loop-aes-modules-2.6.28-grml64
-ndiswrapper-modules-2.6.28-grml64
-#nvidia-kernel-2.6.28-grml64
-openafs-modules-2.6.28-grml64
-rt2400-modules-2.6.28-grml64
-speakup-modules-2.6.28-grml64
-sysprof-module-2.6.28-grml64
-xtables-addons-modules-2.6.28-grml64
-#virtualbox-ose-guest-modules-2.6.28-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 2.6.31-grml64:
+aufs-modules-2.6.31-grml64
+drbd8-2.6.31-grml64
+#fglrx-kernel-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
+rt2400-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
 ## }}}
 
 # vim: foldmethod=marker
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index d76c83b..c6aa3be 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -285,18 +285,17 @@ PACKAGES aptitude I386
 # we want to use linux-kernel-headers-grml instead of linux-libc-dev:
 linux-kernel-headers-grml
 
-at76-usb-modules-2.6.28-grml
-aufs-modules-2.6.28-grml aufs-tools
-#grml-kerneladdons-2.6.28
-linux-image-2.6.28-grml
-#madwifi-modules-2.6.28-grml madwifi-tools
+at76-usb-modules-2.6.31-grml
+aufs-modules-2.6.31-grml aufs-tools
+linux-image-2.6.31-grml
+#madwifi-modules-2.6.31-grml madwifi-tools
 powernowd
-rt2400-modules-2.6.28-grml rt2500-modules-2.6.28-grml rt73-modules-2.6.28-grml firmware-ralink
-#truecrypt-2.6.28-grml
-virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+rt2400-modules-2.6.31-grml rt2500-modules-2.6.31-grml rt73-modules-2.6.31-grml firmware-ralink
+#truecrypt-2.6.31-grml
+virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 
 PACKAGES aptitude AMD64
-aufs-modules-2.6.28-grml64 aufs-tools
-linux-image-2.6.28-grml64
-#madwifi-modules-2.6.28-grml64 madwifi-tools
-#truecrypt-2.6.28-grml64
+aufs-modules-2.6.31-grml64 aufs-tools
+linux-image-2.6.31-grml64
+#madwifi-modules-2.6.31-grml64 madwifi-tools
+#truecrypt-2.6.31-grml64
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 68363cd..cd474ac 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -182,8 +182,8 @@ zoo
 zsh
 
 PACKAGES aptitude I386
-linux-image-2.6.28-grml aufs-modules-2.6.28-grml
+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
 
 PACKAGES aptitude AMD64
-linux-image-2.6.28-grml64 aufs-modules-2.6.28-grml64
+linux-image-2.6.31-grml64 aufs-modules-2.6.31-grml64