Drop grub from all classes and add grub-pc to GRMLBASE

diff --git a/debian/changelog b/debian/changelog
index 20a2d23..e8f456b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-live (0.9.28) UNRELEASED; urgency=low
+
+  * Drop grub from all classes and add grub-pc to GRMLBASE.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 26 Oct 2009 21:15:09 +0100
+
 grml-live (0.9.27) unstable; urgency=low
 
   [ Michael Prokop ]

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 42b90c3..33706e4 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -31,6 +31,7 @@ grml-scripts
 grml-shlib
 grml-usleep
 grml-vpn
+grub-pc
 gzip
 hdparm
 hostname

diff --git a/etc/grml/fai/config/package_config/GRML_FORENSIC b/etc/grml/fai/config/package_config/GRML_FORENSIC
index e88dd9f..55fb977 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FORENSIC
+++ b/etc/grml/fai/config/package_config/GRML_FORENSIC
@@ -391,7 +391,6 @@ gpgv
 gphoto2
 gptsync
 grepmail
-grub
 gsm-utils
 gtkam
 gv

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 396008f..28c7611 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -720,7 +720,6 @@ graphviz
 grep
 grepmail
 groff
-grub
 gsfonts
 gsfonts-x11
 gsm-utils

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 968718a..387e13b 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -91,7 +91,6 @@ grml-terminalserver
 grml-tips
 grml-usleep
 grml-x
-grub
 guessnet
 htop
 ifplugd

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 2eebec5..91d34eb 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -64,7 +64,6 @@ grml-shlib
 # grml-small
 grml-tips
 grml-usleep
-grub
 guessnet
 htop
 ifplugd

diff --git a/grml-live b/grml-live
index cadc470..1142b8e 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.9.27'
+GRML_LIVE_VERSION='0.9.28-pre1'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"