Move grml-hwinfo, hostname, initramfs-tools, initscripts, klibc-utils and laptop...

diff --git a/debian/changelog b/debian/changelog
index 75b115c..6574820 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,8 @@ grml-live (0.9.23) unstable; urgency=low
       dependencies), fileutils and gcom (both transitional package) from
       GRML_FULL.
     - Replace diff with diffutils and move it to GRMLBASE.
-    - Move eject, file-rc, gawk, grep, gpm + gzip to GRMLBASE.
+    - Move eject, file-rc, gawk, gpm, grep, grml-hwinfo, gzip, hostname,
+      initramfs-tools, initscripts, klibc-utils + laptop-detect to GRMLBASE.
     - Add febootstrap to GRML_FULL.
     - Add guymager to GRML_FORENSIC.
     - Add extract and libextractor-plugins to GRML_FORENSIC (thanks to

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 3ab6680..42b90c3 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -22,6 +22,7 @@ grml-debootstrap
 grml-docs
 grml-etc
 grml-etc-core
+grml-hwinfo
 grml-network
 grml-policyrcd
 grml-rebuildfstab
@@ -32,8 +33,13 @@ grml-usleep
 grml-vpn
 gzip
 hdparm
+hostname
 hwinfo
+initramfs-tools
+initscripts
 iw
+klibc-utils
+laptop-detect
 less
 live-initramfs
 lvm2

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 4f5ab98..1a2cbb7 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -62,7 +62,6 @@ grml-etc
 grml-etc-core
 grml-files
 grml-firefox
-grml-hwinfo
 grml-laptop
 grml-live
 grml-mercurial-utils
@@ -753,7 +752,6 @@ hnb
 honeyd
 hostapd
 hostap-utils
-hostname
 hotkeys
 hotkey-setup
 hotswap-text
@@ -768,7 +766,6 @@ httping
 httptunnel
 hunt
 hwdata
-hwinfo
 i2c-tools
 i810switch
 i8kutils
@@ -776,7 +773,6 @@ ibod
 ibritish
 icecast2
 iceweasel
-iceweasel-webdeveloper
 icheck
 icmpush
 id3
@@ -808,8 +804,6 @@ indent
 info
 info2www
 ingerman
-initramfs-tools
-initscripts
 ink
 inotail
 inoticoming
@@ -838,7 +832,6 @@ ipvsadm
 ipx
 ipython
 irb
-irb1.8
 ircii
 irda-utils
 irqbalance
@@ -885,11 +878,9 @@ keychain
 keynav
 keyutils
 kismet
-klibc-utils
 knockd
 knocker
 konwert
-konwert-filters
 kpartx
 kqemu-common
 krb5-config
@@ -897,7 +888,6 @@ krb5-user
 ksh
 kvm
 labrea
-laptop-detect
 laptop-mode-tools
 latencytop
 lbdb
@@ -1887,6 +1877,7 @@ xtrace
 xtrlock
 x-ttcidfont-conf
 xtv
+xul-ext-webdeveloper
 xutils
 xutils-dev
 xvfb

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 4aa9d70..89e6db6 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -74,7 +74,6 @@ grml-docs
 grml-etc
 grml-etc-core
 grml-files
-grml-hwinfo
 grml-laptop
 grml-live
 grml-mercurial-utils
@@ -94,14 +93,10 @@ grml-usleep
 grml-x
 grub
 guessnet
-hostname
 htop
-hwinfo
 ifplugd
 ifupdown
 inetutils-inetd
-initramfs-tools
-initscripts
 iproute
 iptstate
 iputils-ping
@@ -110,9 +105,7 @@ irqbalance
 jed
 jed-common
 keychain
-klibc-utils
 knockd
-laptop-detect
 latencytop
 less
 lilo

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 93af3d7..a6783a0 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -55,7 +55,6 @@ grml-debootstrap
 grml-docs
 grml-etc
 grml-etc-core
-grml-hwinfo
 grml-network
 grml-policyrcd
 grml-rebuildfstab
@@ -67,23 +66,17 @@ grml-tips
 grml-usleep
 grub
 guessnet
-hostname
 htop
-hwinfo
 ifplugd
 ifupdown
 inetutils-inetd
-initramfs-tools
-initscripts
 iproute
 iputils-ping
 ipw-firmware
 jed
 jed-common
 keychain
-klibc-utils
 knockd
-laptop-detect
 less
 lilo
 links