SW: Update linux kernel version to 3.1.0-2

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 02439c8..5927a08 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -282,10 +282,10 @@ usbview
 # kernels
 
 PACKAGES aptitude I386
-linux-image-3.1.0-1-grml-686-pae
+linux-image-3.1.0-2-grml-686-pae
 
 PACKAGES aptitude AMD64
-linux-image-3.1.0-1-grml-amd64
+linux-image-3.1.0-2-grml-amd64
 
 PACKAGES aptitude AMD64
 ia32-libs

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 91ced35..eebbaf5 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -187,11 +187,9 @@ brltty
 espeakup
 
 PACKAGES aptitude I386
-linux-image-3.1.0-1-grml-686-pae
-#linux-image-3.1.0-grml
+linux-image-3.1.0-2-grml-686-pae
 #virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 
 PACKAGES aptitude AMD64
-linux-image-3.1.0-1-grml-amd64
-#linux-image-3.1.0-grml64
+linux-image-3.1.0-2-grml-amd64
 #virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 60bb8e4..dcc3844 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -130,7 +130,7 @@ zoo
 zsh
 
 PACKAGES aptitude I386
-linux-image-3.1.0-grml
+linux-image-3.1.0-2-grml-686-pae
 
 PACKAGES aptitude AMD64
-linux-image-3.1.0-grml64
+linux-image-3.1.0-2-grml-amd64

diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
index 091a6f4..8a50836 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ b/etc/grml/fai/config/package_config/GRML_XL
@@ -1465,6 +1465,7 @@ zd1211-firmware
 ## }}}
 
 ## kernel-version dependent packages {{{
+linux-doc-3.1
 linux-tools-3.1
 ## }}}
 
@@ -1481,30 +1482,28 @@ pstack
 retty
 
 ## current kernel version 3.1.0-grml:
-iscsitarget-module-3.1.0-grml
-linux-doc-3.1.0-grml
-linux-image-3.1.0-grml
-ndiswrapper-modules-3.1.0-grml
-openafs-modules-3.1.0-grml
-sysprof-module-3.1.0-grml
-tp-smapi-modules-3.1.0-grml
-virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-3.1.0-grml
+#iscsitarget-module-3.1.0-grml
+linux-image-3.1.0-2-grml-686-pae
+#ndiswrapper-modules-3.1.0-grml
+#openafs-modules-3.1.0-grml
+#sysprof-module-3.1.0-grml
+#tp-smapi-modules-3.1.0-grml
+#virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+#xtables-addons-modules-3.1.0-grml
 ## }}}
 
 ## amd64 specific packages {{{
 PACKAGES aptitude AMD64
 
 ## current kernel version 3.1.0-grml64:
-iscsitarget-module-3.1.0-grml64
-linux-doc-3.1.0-grml64
-linux-image-3.1.0-grml64
-ndiswrapper-modules-3.1.0-grml64
-openafs-modules-3.1.0-grml64
-sysprof-module-3.1.0-grml64
-tp-smapi-modules-3.1.0-grml64
-xtables-addons-modules-3.1.0-grml64
-virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+#iscsitarget-module-3.1.0-grml64
+linux-image-3.1.0-2-grml-amd64
+#ndiswrapper-modules-3.1.0-grml64
+#openafs-modules-3.1.0-grml64
+#sysprof-module-3.1.0-grml64
+#tp-smapi-modules-3.1.0-grml64
+#xtables-addons-modules-3.1.0-grml64
+#virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker