diff options
| -rw-r--r-- | docs/command-line.txt | 3 | ||||
| -rw-r--r-- | loader/loader.c | 9 | ||||
| -rw-r--r-- | loader/loader.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/docs/command-line.txt b/docs/command-line.txt index 56c4e8dd8..376599d08 100644 --- a/docs/command-line.txt +++ b/docs/command-line.txt @@ -17,6 +17,9 @@ resolution=<mode> Run installer in mode specified, '1024x768' for example. nousb Do not load USB support (helps if install hangs early sometimes). +askmethod Do not automatically use the CD-ROM as the install + source if we detect a Red Hat Linux CD in your CD-ROM drive. + nousbstorage Do not load usbstorage module in loader. May help with device ordering on SCSI systems. diff --git a/loader/loader.c b/loader/loader.c index 430ec0cf6..c0354f54e 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1896,11 +1896,11 @@ static char * doMountImage(char * location, # if defined (__sparc__) || defined (__alpha__) /* Check any attached CDROM device for a Red Hat CD. If there is one there, just die happy */ - if (!FL_EXPERT(flags)) { + if (!FL_ASKMETHOD(flags)) { # else /* If no network is available, check any attached CDROM device for a Red Hat CD. If there is one there, just die happy */ - if (!FL_EXPERT(flags)) { + if (!FL_ASKMETHOD(flags)) { # endif url = setupCdrom(NULL, location, kd, modInfo, modLoaded, modDepsPtr, flags, 1, 1); @@ -2432,7 +2432,10 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource, for (i = 0; i < argc; i++) { if (!strcasecmp(argv[i], "expert")) - flags |= LOADER_FLAGS_EXPERT | LOADER_FLAGS_MODDISK; + flags |= (LOADER_FLAGS_EXPERT | LOADER_FLAGS_MODDISK | + LOADER_FLAGS_ASKMETHOD); + else if (!strcasecmp(argv[i], "askmethod")) + flags |= LOADER_FLAGS_ASKMETHOD; else if (!strcasecmp(argv[i], "telnet")) flags |= LOADER_FLAGS_TELNETD; else if (!strcasecmp(argv[i], "noshell")) diff --git a/loader/loader.h b/loader/loader.h index e039a305f..8f6523464 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -27,6 +27,7 @@ #define LOADER_FLAGS_KSHTTP (1 << 21) #define LOADER_FLAGS_MEDIACHECK (1 << 22) #define LOADER_FLAGS_NOUSBSTORAGE (1 << 23) +#define LOADER_FLAGS_ASKMETHOD (1 << 24) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) #define FL_EXPERT(a) ((a) & LOADER_FLAGS_EXPERT) @@ -55,6 +56,7 @@ #define FL_KSHTTP(a) ((a) & LOADER_FLAGS_KSHTTP) #define FL_MEDIACHECK(a) ((a) & LOADER_FLAGS_MEDIACHECK) #define FL_NOUSBSTORAGE(a) ((a) & LOADER_FLAGS_NOUSBSTORAGE) +#define FL_ASKMETHOD(a) ((a) & LOADER_FLAGS_ASKMETHOD) #define CODE_PCMCIA 1 |