Do not install kernel via GRMLBASE but via GRML_* classes

diff --git a/debian/changelog b/debian/changelog
index 9ac7dc1..0687c46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ grml-live (0.0.3) unstable; urgency=low
     grml_cleanup_chroot.
   * Provide class GRML_SMALL and rename old GRML_SMALL into
     GRML_MEDIUM.
+  * Do not install kernel via GRMLBASE but via GRML_* classes
+    instead so we have only one single kernel on the system
+    with something like 'GRMLBASE,GRML_SMALL,REMOVE_DOCS,I386'.
 
  -- Michael Prokop <mika@grml.org>  Sun, 30 Sep 2007 12:58:15 +0200
 

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index a8c4917..34f9bd6 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -63,8 +63,4 @@ usbutils
 wireless-tools wpasupplicant
 
 PACKAGES aptitude I386 
-grml-kerneladdons-2.6.22 linux-image-2.6.22-grml aufs-modules-2.6.22-grml
 powernowd
-
-PACKAGES aptitude AMD64
-linux-image-2.6.20-grml64 aufs-modules-2.6.20-grml64

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 118284d..1643eb9 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -2094,3 +2094,6 @@ sl-modem-modules-2.6.22-grml
 sysprof-module-2.6.22-grml
 tidev-modules-2.6.22-grml
 truecrypt-2.6.22-grml
+
+PACKAGES aptitude AMD64
+linux-image-2.6.20-grml64 aufs-modules-2.6.20-grml64

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 10abbda..a6aa63d 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -189,4 +189,7 @@ zip
 zsh
 
 PACKAGES aptitude I386 
-linux-image-2.6.22-grml aufs-modules-2.6.22-grml
+linux-image-2.6.22-grml aufs-modules-2.6.22-grml grml-kerneladdons-2.6.22
+
+PACKAGES aptitude AMD64
+linux-image-2.6.20-grml64 aufs-modules-2.6.20-grml64

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 5eddaf9..a493178 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -190,3 +190,6 @@ zsh
 
 PACKAGES aptitude I386 
 linux-image-2.6.20-grml-small aufs-modules-2.6.20-grml-small
+
+PACKAGES aptitude AMD64
+linux-image-2.6.20-grml64 aufs-modules-2.6.20-grml64