diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-16 03:14:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-16 03:14:00 +0000 |
| commit | 1b2f9fe18937b9f187b7fd77a50c2c7d0f369654 (patch) | |
| tree | b7ff101d9d863073b80c569c273b2bdf3b59677f /scripts | |
| parent | 89bc60c3007545a59fa6b2f9b2db076bc546ee59 (diff) | |
| download | anaconda-1b2f9fe18937b9f187b7fd77a50c2c7d0f369654.tar.gz anaconda-1b2f9fe18937b9f187b7fd77a50c2c7d0f369654.tar.xz anaconda-1b2f9fe18937b9f187b7fd77a50c2c7d0f369654.zip | |
get the i586 kernel for cd, pxe, etc now. only use i386 BOOT for floppy
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 2 | ||||
| -rw-r--r-- | scripts/mk-images.i386 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 98f8bde1a..68d9a9195 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -865,6 +865,8 @@ fi vertag="BOOT" if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then arches="ppc64pseries ppc64iseries" +elif [ "$BUILDARCH" = "i386" ]; then + arches="i386 i586" else arches="$BUILDARCH" fi diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 32ba7b71b..d7aa49433 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -178,7 +178,7 @@ makeBootImages() { # FIXME: this is so that we can switch back and forth. if we want both # on the CD, then more needs to be done, esp for things like isolinux.cfg # Right now, last one wins - if [ "$KERNELARCH" = "i686" -o "$KERNELARCH" = "i386" -o "$KERNELARCH" = "i586" -o "$KERNELARCH" = "athlon" ]; then + if [ "$KERNELARCH" = "i686" -o "$KERNELARCH" = "i586" -o "$KERNELARCH" = "athlon" ]; then echo "Building $KERNELARCH initrd-everything.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \ --pcmcia \ |