diff options
| author | Matt Wilson <msw@redhat.com> | 2002-12-17 16:04:09 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2002-12-17 16:04:09 +0000 |
| commit | d55f7e8c2fe6753ac3bac012b3b8e1c5164b2fe3 (patch) | |
| tree | e85054214b763401346ea50fb887e1b856791f9c | |
| parent | e14c5e2863654d0a6e74fefd027638a6ce165248 (diff) | |
| download | anaconda-d55f7e8c2fe6753ac3bac012b3b8e1c5164b2fe3.tar.gz anaconda-d55f7e8c2fe6753ac3bac012b3b8e1c5164b2fe3.tar.xz anaconda-d55f7e8c2fe6753ac3bac012b3b8e1c5164b2fe3.zip | |
allow opt-out of vga16
| -rw-r--r-- | loader2/lang.c | 1 | ||||
| -rw-r--r-- | loader2/loader.c | 5 | ||||
| -rw-r--r-- | loader2/loader.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/loader2/lang.c b/loader2/lang.c index 116efabae..b8d08bb03 100644 --- a/loader2/lang.c +++ b/loader2/lang.c @@ -324,5 +324,4 @@ void setKickstartLanguage(struct loaderData_s * loaderData, int argc, loaderData->lang = argv[1]; loaderData->lang_set = 1; - } diff --git a/loader2/loader.c b/loader2/loader.c index ade1504fa..f4869e497 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -184,7 +184,8 @@ void stopNewt(void) { void initializeConsole(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo, int flags) { - mlLoadModuleSet("vga16fb", modLoaded, modDeps, modInfo, flags); + if (!FL_NOFB(flags)) + mlLoadModuleSet("vga16fb", modLoaded, modDeps, modInfo, flags); /* enable UTF-8 console */ printf("\033%%G"); fflush(stdout); @@ -387,6 +388,8 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData, 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 (!strncasecmp(argv[i], "debug=", 6)) setLogLevel(strtol(argv[i] + 6, (char **)NULL, 10)); else if (!strncasecmp(argv[i], "ksdevice=", 9)) { diff --git a/loader2/loader.h b/loader2/loader.h index 8a800561a..43e98ebe4 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -34,6 +34,7 @@ #define LOADER_FLAGS_ASKMETHOD (1 << 24) #define LOADER_FLAGS_NOPARPORT (1 << 25) #define LOADER_FLAGS_NOIEEE1394 (1 << 26) +#define LOADER_FLAGS_NOFB (1 << 27) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) #define FL_EXPERT(a) ((a) & LOADER_FLAGS_EXPERT) @@ -65,6 +66,7 @@ #define FL_ASKMETHOD(a) ((a) & LOADER_FLAGS_ASKMETHOD) #define FL_NOPARPORT(a) ((a) & LOADER_FLAGS_NOPARPORT) #define FL_NOIEEE1394(a) ((a) & LOADER_FLAGS_NOIEEE1394) +#define FL_NOFB(a) ((a) & LOADER_FLAGS_NOFB) |