SW: Move diffutils + iw from GRMLBASE to GRML_* classes.

This allows using $EXIT_ON_MISSING_PACKAGES with GRMLBASE
but without have to use any of the GRML_* classes if building
a Debian/lenny based system. As iw/diffutils are missing on
lenny this would conflict $EXIT_ON_MISSING_PACKAGES as soon
as you've to use GRMLBASE.

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index e61eba5..699077b 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -5,7 +5,6 @@ bzip2
 console-common
 cron
 deborphan
 console-common
 cron
 deborphan

-diffutils

 dmidecode
 eject
 file
 dmidecode
 eject
 file


@@ -40,7 +39,6 @@ hostname
 hwinfo
 initramfs-tools
 initscripts
 hwinfo
 initramfs-tools
 initscripts

-iw

 klibc-utils
 laptop-detect
 less
 klibc-utils
 laptop-detect
 less

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index ce62829..daac923 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -450,6 +450,7 @@ dictionaries-common
 dietlibc
 dietlibc-dev
 diffstat
 dietlibc
 dietlibc-dev
 diffstat

+diffutils

 ding
 dir2ogg
 dirdiff
 ding
 dir2ogg
 dirdiff


@@ -815,6 +816,7 @@ ispell
 isync
 itop
 ivtv-utils
 isync
 itop
 ivtv-utils

+iw

 iwatch
 jack
 jackd
 iwatch
 jack
 jackd

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 552927c..74cdf24 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -42,6 +42,7 @@ debootstrap
 deborphan
 dhcp3-client
 dialog
 deborphan
 dhcp3-client
 dialog

+diffutils

 dmraid
 dmsetup
 dns2tcp
 dmraid
 dmsetup
 dns2tcp


@@ -85,6 +86,7 @@ iptstate
 iputils-ping
 ipw-firmware
 irqbalance
 iputils-ping
 ipw-firmware
 irqbalance

+iw

 jed
 jed-common
 jfsutils
 jed
 jed-common
 jfsutils

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index ac74f70..ea4012e 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -34,6 +34,7 @@ debianutils
 deborphan
 dhcp3-client
 dialog
 deborphan
 dhcp3-client
 dialog

+diffutils

 dmraid
 dmsetup
 dosfstools
 dmraid
 dmsetup
 dosfstools


@@ -56,6 +57,7 @@ inetutils-inetd
 iproute
 iputils-ping
 ipw-firmware
 iproute
 iputils-ping
 ipw-firmware

+iw

 jed
 jed-common
 jfsutils
 jed
 jed-common
 jfsutils