diff options
author | Jeremy Katz <katzj@redhat.com> | 2007-04-30 16:55:26 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2007-04-30 16:55:26 +0000 |
commit | ff72facaa0ff5e7278c2d698b73ad4ce7faf101c (patch) | |
tree | 0012125e5c54d5518be5b4ccc939d6819d2d65b6 /loader2 | |
parent | cc01bac6c889836cd61e128091a6ed444cd61b0a (diff) | |
download | anaconda-ff72facaa0ff5e7278c2d698b73ad4ce7faf101c.tar.gz anaconda-ff72facaa0ff5e7278c2d698b73ad4ce7faf101c.tar.xz anaconda-ff72facaa0ff5e7278c2d698b73ad4ce7faf101c.zip |
2007-04-30 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c (parseCmdLineFlags): Default to graphical
earlier; mention empty kernel cmdline also
Diffstat (limited to 'loader2')
-rw-r--r-- | loader2/loader.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index 90d6b0628..b8effb274 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -580,13 +580,19 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, int i; char *front; + /* we want to default to graphical and allow override with 'text' */ + flags |= LOADER_FLAGS_GRAPHICAL; + /* if we have any explicit cmdline (probably test mode), we don't want * to parse /proc/cmdline */ if (!cmdLine) { if ((fd = open("/proc/cmdline", O_RDONLY)) < 0) return; len = read(fd, buf, sizeof(buf) - 1); close(fd); - if (len <= 0) return; + if (len <= 0) { + logMessage(INFO, "kernel command line was empty"); + return; + } buf[len] = '\0'; cmdLine = buf; @@ -597,9 +603,6 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, if (poptParseArgvString(cmdLine, &argc, (const char ***) &argv)) return; - /* we want to default to graphical and allow override with 'text' */ - flags |= LOADER_FLAGS_GRAPHICAL; - for (i=0; i < argc; i++) { if (!strcasecmp(argv[i], "expert")) { flags |= LOADER_FLAGS_EXPERT; |