diff options
| -rw-r--r-- | bootdisk/ia64/bootfs.gz | bin | 56895 -> 103098 bytes | |||
| -rw-r--r-- | loader/loader.c | 3 | ||||
| -rw-r--r-- | scripts/mk-images.ia64 | 2 | ||||
| -rw-r--r-- | todo.py | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/bootdisk/ia64/bootfs.gz b/bootdisk/ia64/bootfs.gz Binary files differindex 88d9d3865..f4227f937 100644 --- a/bootdisk/ia64/bootfs.gz +++ b/bootdisk/ia64/bootfs.gz diff --git a/loader/loader.c b/loader/loader.c index b4b86a72d..b9a9eefbf 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2338,8 +2338,7 @@ void setFloppyDevice(int flags) { if (!foundFd0) floppyDevice = strdup(devices[0]->device); #else /* ia64 */ - floppyDevice=malloc(strlen(devices[0]->device)+2); - sprintf(floppyDevice,"%s1",devices[0]->device); + floppyDevice=strdup(devices[0]->device); #endif #endif diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 1782f2402..b32781ba3 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -9,7 +9,7 @@ IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd" prepareBootImage() { gunzip < $BOOTDISKDIR/bootfs.gz > $MBD_TMPIMAGE - mount -o loop,offset=16384 -t vfat $MBD_TMPIMAGE $MBD_BOOTTREE + mount -o loop -t vfat $MBD_TMPIMAGE $MBD_BOOTTREE cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img cp $KERNELROOT/boot/efi/vmlinux-* $MBD_BOOTTREE/vmlinux @@ -485,9 +485,7 @@ class ToDo: # No IDE floppy's -- we're fine w/ /dev/fd0 if not floppyDrive: return - # on ia64, use the first partition (hack) if iutil.getArch() == "ia64": - floppyDrive = '%s1' % floppyDrive self.fdDevice = floppyDrive log("anaconda floppy device is %s", self.fdDevice) return |