diff options
| -rwxr-xr-x | anaconda | 9 | ||||
| -rw-r--r-- | loader/loader.c | 4 | ||||
| -rw-r--r-- | loader/loader.h | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -55,7 +55,7 @@ try: 'method=', 'rootpath=', 'pcic=', "overhead=", 'testpath=', 'mountfs', 'traceonly', 'kickstart=', 'lang=', 'keymap=', 'kbdtype=', 'module=', 'class=', - 'expert', 'serial', 'lowres', 'rescue']) + 'expert', 'serial', 'lowres', 'nofb', 'rescue']) except TypeError, msg: print "Error:", msg sys.exit(-1) @@ -114,6 +114,7 @@ nofallback = 0 rescue = 0 overhead = 0 runres = '800x600' +fbmode = 0 # # x - xserver info (?) @@ -201,6 +202,8 @@ for n in args: customClass = arg elif (str == '--lowres'): runres = '640x480' + elif (str == '--nofb'): + fbmode = 1 # # must specify install, rescue or reconfig mode @@ -307,7 +310,7 @@ if (display_mode == 'g' and not os.environ.has_key('DISPLAY')): import xserver try: if (reconfigOnly == 0): - result = xserver.startX (runres) + result = xserver.startX (runres, fbmode) else: result = xserver.start_existing_X () @@ -412,7 +415,7 @@ if xmode: if display_mode == "t": intf = InstallInterface () else: - intf = InstallInterface (runres = runres) + intf = InstallInterface (runres = runres, fbmode = fbmode) # imports after setting up the path if not reconfigOnly: diff --git a/loader/loader.c b/loader/loader.c index 181daacd2..bcc9def8b 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1953,6 +1953,8 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource, flags |= LOADER_FLAGS_NOSHELL; else if (!strcasecmp(argv[i], "lowres")) flags |= LOADER_FLAGS_LOWRES; + else if (!strcasecmp(argv[i], "nofb")) + flags |= LOADER_FLAGS_NOFB; else if (!strcasecmp(argv[i], "nousb")) flags |= LOADER_FLAGS_NOUSB; else if (!strcasecmp(argv[i], "noprobe")) @@ -2854,6 +2856,8 @@ int main(int argc, char ** argv) { *argptr++ = "--expert"; if (FL_LOWRES(flags)) *argptr++ = "--lowres"; + if (FL_NOFB(flags)) + *argptr++ = "--nofb"; if (FL_KICKSTART(flags)) { *argptr++ = "--kickstart"; diff --git a/loader/loader.h b/loader/loader.h index 565217c20..bbcb93ffd 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -22,6 +22,7 @@ #define LOADER_FLAGS_NOUSB (1 << 16) #define LOADER_FLAGS_NOSHELL (1 << 17) #define LOADER_FLAGS_LOWRES (1 << 18) +#define LOADER_FLAGS_NOFB (1 << 19) #define LOADER_FLAGS_NOPCMCIA (1 << 16) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) @@ -43,6 +44,7 @@ #define FL_NOUSB(a) ((a) & LOADER_FLAGS_NOUSB) #define FL_NOSHELL(a) ((a) & LOADER_FLAGS_NOSHELL) #define FL_LOWRES(a) ((a) & LOADER_FLAGS_LOWRES) +#define FL_NOFB(a) ((a) & LOADER_FLAGS_NOFB) #define FL_NOPCMCIA(a) ((a) & LOADER_FLAGS_NOPCMCIA) #define CODE_PCMCIA 1 |