diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-13 18:56:25 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-13 18:56:25 +0000 |
| commit | 770220d29752c637fda5ecc4072efce161b1499c (patch) | |
| tree | 6a18d86ee6429d60d3c0340e499db8913a75f003 /loader | |
| parent | 5da684416bce7bae54b566ceee34198dcdc2e8a6 (diff) | |
| download | anaconda-770220d29752c637fda5ecc4072efce161b1499c.tar.gz anaconda-770220d29752c637fda5ecc4072efce161b1499c.tar.xz anaconda-770220d29752c637fda5ecc4072efce161b1499c.zip | |
jj patches, fixups for upgrade lilo stuff
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/Makefile | 2 | ||||
| -rw-r--r-- | loader/lang.c | 7 | ||||
| -rw-r--r-- | loader/loader.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/loader/Makefile b/loader/Makefile index fad6e76a1..3163742a1 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -11,7 +11,9 @@ SOURCES = $(subst .o,.c,$(OBJS) $(LOADEROBJS)) BINS = init DIRS = NETOBJS = net.o +ifeq (i386, $(ARCH)) KON = 1 +endif PCMCIAOBJS = pcmcia.o $(NETOBJS) OPTS = -O2 -g diff --git a/loader/lang.c b/loader/lang.c index ba745db1a..26e4e8617 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -371,6 +371,7 @@ int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) { /*if (testing) return 0;*/ #ifdef __sparc__ +#if 0 if (kickstart) { kbdtype = KBDTYPE_SUN; if (!ksGetCommand(KS_CMD_KBDTYPE, NULL, &argc, &argv)) { @@ -384,7 +385,9 @@ int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) { kbdtype = KBDTYPE_PC; } } - } else { + } else +#endif + { char twelve = 12; int fd; @@ -516,8 +519,6 @@ int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) { j++; } #endif - - logMessage("using keymap %s", infoTable[num].name); for (i = 0; i < num; i++) { if (gzread(f, buf, infoTable[i].size) != infoTable[i].size) { diff --git a/loader/loader.c b/loader/loader.c index 0e8979836..01db8938f 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -599,8 +599,6 @@ static char * mountHardDrive(struct installMethod * method, label = newtLabel(-1, -1, _("Directory holding Red Hat:")); - tmpDir = dir ? strdup(dir) : NULL; - dirEntry = newtEntry(28, 11, dir, 28, &tmpDir, NEWT_ENTRY_SCROLL); entryGrid = newtGridHStacked(NEWT_GRID_COMPONENT, label, @@ -633,8 +631,8 @@ static char * mountHardDrive(struct installMethod * method, if (dir) free(dir); if (tmpDir && *tmpDir) { + /* Protect from form free. */ dir = strdup(tmpDir); - free(tmpDir); } else { dir = NULL; } |