diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-10-22 04:03:06 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-10-22 04:03:06 +0000 |
| commit | d52e2429669757ab51b5463782a4823ae19839f7 (patch) | |
| tree | aa744330bd6d90d1dde9e471297c6565a88ad82c /loader | |
| parent | bf0fe34625e647f7ca4060d68f660fad8749410a (diff) | |
| download | anaconda-d52e2429669757ab51b5463782a4823ae19839f7.tar.gz anaconda-d52e2429669757ab51b5463782a4823ae19839f7.tar.xz anaconda-d52e2429669757ab51b5463782a4823ae19839f7.zip | |
loader builds... pull forward only a very small amount of the changes from the
7.1 ppc for now
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/Makefile | 5 | ||||
| -rw-r--r-- | loader/loader.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/loader/Makefile b/loader/Makefile index fa91948a7..037029d8e 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -87,6 +87,11 @@ BINS += loader loader-local OBJS += stubs.o endif +ifeq (ppc, $(ARCH)) +BINS += loader +OBJS += stubs.o +endif + ifeq (.depend,$(wildcard .depend)) TARGET=$(PROGS) else diff --git a/loader/loader.c b/loader/loader.c index 0a05ea68a..6b6c59700 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1982,7 +1982,7 @@ static char * doMountImage(char * location, #endif #if defined(__alpha__) || defined(__ia64__) \ - || defined(__s390__ ) || defined(__s390x__) + || defined(__s390__ ) || defined(__s390x__) || defined(__powerpc__) for (i = 0; i < numMethods; i++) { installNames[numValidMethods] = _(installMethods[i].name); validMethods[numValidMethods++] = i; @@ -3062,7 +3062,7 @@ char *getCurrentFloppyDevice() { return floppyDevice; } void setFloppyDevice(int flags) { -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__powerpc__) struct device ** devices; int foundFd0 = 0; int i = 0; @@ -3590,7 +3590,8 @@ int main(int argc, char ** argv) { if (!continuing) { if ((access("/proc/bus/pci/devices", R_OK) && - access("/proc/openprom", R_OK)) || FL_MODDISK(flags)) { + access("/proc/openprom", R_OK) && + access("/proc/iSeries", R_OK)) || FL_MODDISK(flags)) { startNewt(flags); devLoadDriverDisk(modInfo, modLoaded, &modDeps, flags, 1, 1, floppyDevice); @@ -3766,7 +3767,8 @@ int main(int argc, char ** argv) { } if (((access("/proc/bus/pci/devices", R_OK) && - access("/proc/openprom", R_OK)) || + access("/proc/openprom", R_OK) && + access("/proc/iSeries", R_OK)) || FL_ISA(flags) || FL_NOPROBE(flags)) && !ksFile) { startNewt(flags); manualDeviceCheck(modInfo, modLoaded, &modDeps, &kd, flags); |