diff options
| author | Matt Wilson <msw@redhat.com> | 2000-12-05 05:10:22 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-12-05 05:10:22 +0000 |
| commit | 265e97939a298b322011fc6bd0b3624583bea43b (patch) | |
| tree | 4f07c847055e4325dfcbbf984bf443d4ebeb9f6e /loader | |
| parent | f8ea2eb11c04a8d0d9e4b787f8b082e949af6bcc (diff) | |
| download | anaconda-265e97939a298b322011fc6bd0b3624583bea43b.tar.gz anaconda-265e97939a298b322011fc6bd0b3624583bea43b.tar.xz anaconda-265e97939a298b322011fc6bd0b3624583bea43b.zip | |
merge from anaconda-7-0-alpha-branch
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/Makefile | 6 | ||||
| -rw-r--r-- | loader/loader.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/loader/Makefile b/loader/Makefile index 09b071d03..35c57abf6 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -22,7 +22,8 @@ BINS = init DIRS = NETOBJS = net.o PCMCIAOBJS = pcmcia.o $(NETOBJS) -OPTS = -O2 -g +#OPTS = -O2 -g +OPTS = -O -g MODULELINKAGE :=../isys/modutils/insmod/libmodutils.a \ ../isys/modutils/util/libutil.a \ @@ -118,6 +119,9 @@ install: all install -m 644 kon.cfg $(DESTDIR)/$(RUNTIMEDIR)/loader install -m 644 minikon.fnt $(DESTDIR)/$(RUNTIMEDIR)/loader +urltest: urltest.o ftp.o urls.o lang.o log.o windows.o + $(CC) -g -o urltest urltest.o -lnewt ftp.o urls.o lang.o log.o windows.o -lz ../isys/libisys.a -lresolv + loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ -lkudzu_loader ../isys/libisys.a ../balkan/libbalkan.a \ diff --git a/loader/loader.c b/loader/loader.c index 69c81f1f6..9dfba7a3e 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2647,8 +2647,6 @@ logMessage("found url image %s", url); unlink("/lib"); symlink("mnt/runtime/lib", "/lib"); -/* the only modules we need for alpha are on the initrd */ -#if !defined(__alpha__) unlink("/modules/modules.dep"); unlink("/modules/module-info"); unlink("/modules/pcitable"); @@ -2673,7 +2671,7 @@ logMessage("found url image %s", url); symlink("../mnt/runtime/modules/modules64.cgz", "/modules/modules65.cgz"); # endif -#endif /* !__alpha__ and !__ia32__ */ +#endif /* !__ia64__ */ } logMessage("getting ready to spawn shell now"); |