diff options
| author | Matt Wilson <msw@redhat.com> | 2001-07-12 16:56:30 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-07-12 16:56:30 +0000 |
| commit | 2df0a6736a2f27355ab246faf769ef585c6b5c28 (patch) | |
| tree | 01ad359c6174ee943ee05685400b0caaeb5ec24a /loader | |
| parent | aac3d29c9281bb9715dd2dbe270fa24ab21aebeb (diff) | |
| download | anaconda-2df0a6736a2f27355ab246faf769ef585c6b5c28.tar.gz anaconda-2df0a6736a2f27355ab246faf769ef585c6b5c28.tar.xz anaconda-2df0a6736a2f27355ab246faf769ef585c6b5c28.zip | |
a few more s/Ok/OK/
add a flag that lets you test all GUI screens even via netboot
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 6 | ||||
| -rw-r--r-- | loader/loader.h | 2 | ||||
| -rw-r--r-- | loader/urls.c | 8 | ||||
| -rw-r--r-- | loader/urltest.c | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/loader/loader.c b/loader/loader.c index 89a357ccd..35347efaf 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1922,6 +1922,8 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource, flags |= LOADER_FLAGS_RESCUE; else if (!strcasecmp(argv[i], "nomount")) flags |= LOADER_FLAGS_RESCUE_NOMOUNT; + else if (!strcasecmp(argv[i], "nopass")) + flags |= LOADER_FLAGS_NOPASS; else if (!strncasecmp(argv[i], "ksdevice=", 9)) { *ksDevice = argv[i] + 9; } else if (!strcasecmp(argv[i], "serial")) @@ -2859,12 +2861,12 @@ int main(int argc, char ** argv) { *argptr++ = lang; } - if (keymap) { + if (keymap && !FL_NOPASS(flags)) { *argptr++ = "--keymap"; *argptr++ = keymap; } - if (kbdtype) { + if (kbdtype && !FL_NOPASS(flags)) { *argptr++ = "--kbdtype"; *argptr++ = kbdtype; } diff --git a/loader/loader.h b/loader/loader.h index 00573a00f..de4e21305 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -26,6 +26,7 @@ #define LOADER_FLAGS_NOPCMCIA (1 << 20) #define LOADER_FLAGS_RESCUE_NOMOUNT (1 << 21) #define LOADER_FLAGS_TELNETD (1 << 22) +#define LOADER_FLAGS_NOPASS (1 << 23) #define FL_TESTING(a) ((a) & LOADER_FLAGS_TESTING) #define FL_EXPERT(a) ((a) & LOADER_FLAGS_EXPERT) @@ -50,6 +51,7 @@ #define FL_NOPCMCIA(a) ((a) & LOADER_FLAGS_NOPCMCIA) #define FL_RESCUE_NOMOUNT(a) ((a) & LOADER_FLAGS_RESCUE_NOMOUNT) #define FL_TELNETD(a) ((a) & LOADER_FLAGS_TELNETD) +#define FL_NOPASS(a) ((a) & LOADER_FLAGS_NOPASS) #define CODE_PCMCIA 1 diff --git a/loader/urls.c b/loader/urls.c index 2d682cf1e..3292ab747 100644 --- a/loader/urls.c +++ b/loader/urls.c @@ -76,7 +76,7 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename, ui->password ? ui->password : "rhinstall@", NULL, -1); if (ui->ftpPort < 0) { - newtWinMessage(_("Error"), _("Ok"), + newtWinMessage(_("Error"), _("OK"), _("Failed to log into %s: %s"), ui->address, ftpStrerror(ui->ftpPort)); return -2; @@ -86,7 +86,7 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename, if (fd < 0) { close(ui->ftpPort); if (!silentErrors) - newtWinMessage(_("Error"), _("Ok"), + newtWinMessage(_("Error"), _("OK"), _("Failed to retrieve %s: %s"), buf, ftpStrerror(fd)); return -1; } @@ -94,7 +94,7 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename, fd = httpGetFileDesc(ui->address, -1, buf); if (fd < 0) { if (!silentErrors) - newtWinMessage(_("Error"), _("Ok"), + newtWinMessage(_("Error"), _("OK"), _("Failed to retrieve %s: %s"), buf, ftpStrerror(fd)); return -1; } @@ -244,7 +244,7 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol, } if (!addrToIp(site)) { - newtWinMessage(_("Unknown Host"), _("Ok"), + newtWinMessage(_("Unknown Host"), _("OK"), _("%s is not a valid hostname."), site); continue; } diff --git a/loader/urltest.c b/loader/urltest.c index 817e4aff3..e9e22b5c7 100644 --- a/loader/urltest.c +++ b/loader/urltest.c @@ -28,7 +28,7 @@ int main(void) { buf[size] = '\0'; urlinstFinishTransfer(&iu, fd); - newtWinMessage("Got it", "Ok", "Got: '%s'", buf); + newtWinMessage("Got it", "OK", "Got: '%s'", buf); } newtFinished(); |