diff options
| author | Matt Wilson <msw@redhat.com> | 1999-10-13 03:55:37 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-10-13 03:55:37 +0000 |
| commit | 8ee84ab43abe570f889dea64024a061c8f5be0ce (patch) | |
| tree | db46aa5554f5eec735ca960897705757445e61b2 | |
| parent | 62c6640682f3854b323cba66ec072ee05004574b (diff) | |
| download | anaconda-8ee84ab43abe570f889dea64024a061c8f5be0ce.tar.gz anaconda-8ee84ab43abe570f889dea64024a061c8f5be0ce.tar.xz anaconda-8ee84ab43abe570f889dea64024a061c8f5be0ce.zip | |
more japan
| -rw-r--r-- | loader/Makefile | 6 | ||||
| -rw-r--r-- | loader/loader.c | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/loader/Makefile b/loader/Makefile index f4080ed16..d5cc4f4aa 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -68,7 +68,11 @@ STATIC=-static endif endif -LANGS = cs hu is id it no ro ru sr sk sl tr uk fr de +ifeq (1, $(KON)) +LANGS = ja +else +LANGS = cs hu is id it no ro ru sr sk sl tr uk fr de ja +endif TR = $(patsubst %,tr/%.tr,$(LANGS)) diff --git a/loader/loader.c b/loader/loader.c index 610ab7a12..443487824 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -111,6 +111,9 @@ static struct installMethod installMethods[] = { static int numMethods = sizeof(installMethods) / sizeof(struct installMethod); static int newtRunning = 0; +#ifdef INCLUDE_KON +static int startKon = 1; +#endif void doSuspend(void) { newtFinished(); @@ -1466,12 +1469,12 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource) { } else if (!strncasecmp(argv[i], "lang=", 5)) { setLanguage (argv[i] + 5); #ifdef INCLUDE_KON - if (!strcmp (argv[i] + 5, "ja")) { + if (!strcmp (argv[i] + 5, "ja") && startKon) { char * args[5]; args[0] = "kon"; args[1] = "-e"; - args[2] = "/sbin/loader"; + args[2] = "/sbin/loader-continue"; args[3] = NULL; execv(FL_TESTING(flags) ? "./loader" : "/sbin/loader", args); @@ -1704,6 +1707,8 @@ int main(int argc, char ** argv) { #ifdef INCLUDE_KON else if (!strcmp(argv[0] + strlen(argv[0]) - 3, "kon")) return kon_main(argc, argv); + else if (!strcmp(argv[0] + strlen(argv[0]) - 15, "loader-continue")) + startKon = 0; #endif #ifdef INCLUDE_PCMCIA |