[PATCH] evicserate more of the fb/bterm support

[Bill Nottingham <notting@xxxxxxxxxx>]

Ignore the command line option, don't ship vga16fb, don't ship the bterm
terminfo, etc.

Bill

? traceback
? iw/iscsi_gui.py
? loader2/DEADJOE
? loader2/dietstubs.c
? textw/DEADJOE
? textw/iscsi_text.py
Index: docs/command-line.txt
===================================================================
RCS file: /usr/local/CVS/anaconda/docs/command-line.txt,v
retrieving revision 1.31
diff -u -r1.31 command-line.txt
--- docs/command-line.txt	20 Mar 2007 14:10:36 -0000	1.31
+++ docs/command-line.txt	18 Jun 2007 16:11:43 -0000
@@ -97,9 +97,6 @@
 
 netmask=<nm> 	Netmask to use for a network installation.
 
-nofb		Do not load the VGA16 framebuffer required for doing 
-		text-mode installation in some languages
-
 nofirewire      Do not load support for firewire devices
 
 noipv6          Disable IPv6 networking during installation.
Index: loader2/loader.c
===================================================================
RCS file: /usr/local/CVS/anaconda/loader2/loader.c,v
retrieving revision 1.246
diff -u -r1.246 loader.c
--- loader2/loader.c	6 Jun 2007 14:35:16 -0000	1.246
+++ loader2/loader.c	18 Jun 2007 16:11:44 -0000
@@ -102,7 +102,7 @@
 static int newtRunning = 0;
 
 /* boot flags -- we need these in a lot of places */
-int flags = LOADER_FLAGS_SELINUX | LOADER_FLAGS_NOFB;
+int flags = LOADER_FLAGS_SELINUX;
 
 #ifdef INCLUDE_LOCAL
 #include "cdinstall.h"
@@ -221,9 +221,6 @@
 
 void initializeConsole(moduleList modLoaded, moduleDeps modDeps,
                        moduleInfoSet modInfo) {
-    if (!FL_NOFB(flags))
-        mlLoadModuleSet("vgastate:vga16fb", modLoaded, modDeps, modInfo);
-
     /* enable UTF-8 console */
     printf("\033%%G");
     fflush(stdout);
@@ -666,8 +663,6 @@
             flags |= LOADER_FLAGS_NOPASS;
         else if (!strcasecmp(argv[i], "serial")) 
             flags |= LOADER_FLAGS_SERIAL;
-        else if (!strcasecmp(argv[i], "nofb"))
-            flags |= LOADER_FLAGS_NOFB;
         else if (!strcasecmp(argv[i], "noipv6")) {
             flags |= LOADER_FLAGS_NOIPV6;
             loaderData->noipv6 = 1;
@@ -793,7 +788,7 @@
                     if (asprintf(&extraArgs[numExtraArgs],
                                  "--xdriver=vesa") == -1)
                         return;
-                    logMessage(WARNING, "\"vesa\" command line argument is deprecated.  Use \"xdriver=vesa\".");
+                    logmessage(warning, "\"vesa\" command line argument is deprecated.  use \"xdriver=vesa\".");
                 } else {
                     if (asprintf(&extraArgs[numExtraArgs],"--%s",argv[i]) == -1)
                         return;
@@ -1516,9 +1511,6 @@
         logMessage(INFO, "text mode forced due to serial/virtpconsole");
         flags |= LOADER_FLAGS_TEXT;
     }
-    if (FL_SERIAL(flags))
-        flags |= LOADER_FLAGS_NOFB;
-
     setupRamfs();
 
     arg = FL_TESTING(flags) ? "./module-info" : "/modules/module-info";
Index: scripts/mk-images
===================================================================
RCS file: /usr/local/CVS/anaconda/scripts/mk-images,v
retrieving revision 1.239
diff -u -r1.239 mk-images
--- scripts/mk-images	15 Jun 2007 15:09:08 -0000	1.239
+++ scripts/mk-images	18 Jun 2007 16:11:44 -0000
@@ -47,9 +47,8 @@
 LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-emc dm-crypt"
 RAIDMODS="md raid0 raid1 raid5 raid6 raid456 raid10"
 SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS"
-BTERMMODS="vga16fb"
 PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"
-INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
+INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
 
 # Set, verify, and create paths
     KERNELPATH=$1
@@ -618,7 +617,7 @@
     install -m 644 $MYLANGTABLE $MBD_DIR/etc/lang-table
     
     install -m 644 $LOADERBINDIR/$MYLOADERTR $MBD_DIR/etc/loader.tr
-    for i in a/ansi d/dumb l/linux s/screen v/vt100 v/vt100-nav v/vt102 x/xterm x/xterm-color b/bterm g/gnome ; do
+    for i in a/ansi d/dumb l/linux s/screen v/vt100 v/vt100-nav v/vt102 x/xterm x/xterm-color g/gnome ; do
 	[ -f $IMGPATH/usr/share/terminfo/$i ] && \
 	  install -m 644 $IMGPATH/usr/share/terminfo/$i $MBD_DIR/etc/terminfo/$i
     done
Index: scripts/upd-instroot
===================================================================
RCS file: /usr/local/CVS/anaconda/scripts/upd-instroot,v
retrieving revision 1.557
diff -u -r1.557 upd-instroot
--- scripts/upd-instroot	18 Jun 2007 14:09:33 -0000	1.557
+++ scripts/upd-instroot	18 Jun 2007 16:11:44 -0000
@@ -469,7 +469,6 @@
 usr/share/anaconda/anaconda.conf
 usr/share/selinux/targeted/base.pp
 usr/share/system-config-date/zonetab.py*
-usr/share/terminfo/b/bterm
 usr/share/terminfo/l/linux
 usr/share/terminfo/v/vt100
 usr/share/terminfo/v/vt100-nav