SW: replace console-tools with kbd

During the Grml developer meeting in Vienna it was decided to default
to kbd instead of console-tools. While this is fixed in grml-autoconfig
we also must make sure that console-tools isn't pulled back in again
during NFSROOT installation and/or during GRML_* packages installation.

diff --git a/etc/grml/fai/NFSROOT b/etc/grml/fai/NFSROOT
index 19379a9..1cc1540 100644 (file)
--- a/etc/grml/fai/NFSROOT
+++ b/etc/grml/fai/NFSROOT
@@ -6,7 +6,7 @@ bootpc rsync lftp rsh-client less dump reiserfsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
 dnsutils ntpdate dosfstools cvs jove xfsprogs xfsdump
 procinfo dialog discover mdetect
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
 dnsutils ntpdate dosfstools cvs jove xfsprogs xfsdump
 procinfo dialog discover mdetect

-console-tools console-common
+kbd

 expect iproute udev subversion
 live-initramfs
 
 expect iproute udev subversion
 live-initramfs
 

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index f7b5418..cdf08a5 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -3,7 +3,6 @@ PACKAGES aptitude
 aufs-tools
 busybox
 bzip2
 aufs-tools
 busybox
 bzip2

-console-common

 deborphan
 dmidecode
 eject
 deborphan
 dmidecode
 eject

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index b7876a0..f02b5fa 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -314,9 +314,6 @@ configure-debian
 conkeror
 connect-proxy
 conntrack
 conkeror
 connect-proxy
 conntrack

-console-data
-console-terminus
-console-tools

 conspy
 convmv
 coreutils
 conspy
 convmv
 coreutils


@@ -782,7 +779,6 @@ jp2a
 juke
 jwm
 kanif
 juke
 jwm
 kanif

-kbd-compat

 keepalived
 kernel-package
 ketchup
 keepalived
 kernel-package
 ketchup

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 6fb5edd..857296a 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -21,8 +21,6 @@ bsdmainutils
 bsdutils
 buffer
 chntpw
 bsdutils
 buffer
 chntpw

-console-terminus
-console-tools

 coreutils
 cpio
 cryptsetup
 coreutils
 cpio
 cryptsetup

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index f0bb0b0..de467b2 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -15,8 +15,6 @@ bsdmainutils
 bsdutils
 buffer
 chntpw
 bsdutils
 buffer
 chntpw

-console-terminus
-console-tools

 coreutils
 cpio
 cryptsetup
 coreutils
 cpio
 cryptsetup