diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-09-09 16:34:48 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-09-09 16:34:48 +0000 |
| commit | 8980dc588ed8af76e7d8d5456bf47a1577b7b079 (patch) | |
| tree | e00d62f7d00abe973ccdc8ef9786315eac6e35bb /scripts | |
| parent | 4b4925ef0b47fc7d4e6d95fc3a098810b4f4bcb8 (diff) | |
merge ia64 changes to HEAD
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mk-images.ia64 | 21 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 8 |
2 files changed, 16 insertions, 13 deletions
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 6b2131060..aa7b104aa 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -1,21 +1,23 @@ # LATEUSBMODS go in the second stage -USBMODS="usb-uhci hid keybdev" +USBMODS="usb-uhci usb-ohci hid keybdev" LATEUSBMODS="mousedev" SECSTAGE="nfs fat vfat raid0 raid1 raid5 ext3 $LATEUSBMODS" -NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin" -SCSIMODULES="DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2x00 qla2200 qla2300 sym53c8xx" +NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3" +SCSIMODULES="DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase" IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd" prepareBootImage() { dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_TMPIMAGE 2>/dev/null mkdosfs -C $MBD_TMPIMAGE $BOOTDISKSIZE >/dev/null mount -o loop -t vfat $MBD_TMPIMAGE $MBD_BOOTTREE - cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img + mkdir -p $MBD_BOOTTREE/EFI/boot + cp $MBD_FSIMAGE $MBD_BOOTTREE/EFI/boot/initrd.img - cp -a $BOOTDISKDIR/* $MBD_BOOTTREE/ - cp $KERNELROOT/boot/efi/vmlinuz-* $MBD_BOOTTREE/vmlinuz - cat > $MBD_BOOTTREE/elilo.conf << EOF + cp -a $BOOTDISKDIR/* $MBD_BOOTTREE/EFI/boot/ + cp $KERNELROOT/boot/efi/EFI/redhat/vmlinuz-* $MBD_BOOTTREE/EFI/boot/vmlinuz + cp $MBD_BOOTTREE/EFI/boot/elilo.efi $MBD_BOOTTREE/EFI/boot/bootia64.efi + cat > $MBD_BOOTTREE/EFI/boot/elilo.conf << EOF prompt timeout=50 @@ -25,11 +27,14 @@ image=vmlinuz append="ramdisk_size=12288 maxcpus=1" initrd=initrd.img EOF + + # make a copy in the root of the image + cp $MBD_BOOTTREE/EFI/boot/* $MBD_BOOTTREE/ } makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz \ --imagename boot.img \ - --bootdisksize 10240 \ + --bootdisksize 20480 \ --initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \ --initrdsize 8192 \ --loaderbin loader \ diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 433291395..09f6d898e 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -175,8 +175,7 @@ fi KEEPFILE=/tmp/keepfile.$$ cat > $KEEPFILE <<EOF -boot/efi/elilo.efi -boot/efi/efi/boot/bootia64.efi +boot/efi/EFI/redhat/elilo.efi bin/ash bin/fdisk* bin/mkfs* @@ -401,8 +400,7 @@ fi KEEPFILEGR=/tmp/keepfilegr.$$ cp $KEEPFILE $KEEPFILEGR cat >> $KEEPFILEGR <<EOF -boot/efi/elilo.efi -boot/efi/efi/boot/bootia64.efi +boot/efi/EFI/redhat/elilo.efi bin/bash bin/cat bin/chmod @@ -812,7 +810,7 @@ for p in $DEST $DESTGR; do # copy bootloader files for ia64 if [ $ARCH = ia64 -a $p = $DESTGR ]; then mkdir -p $p/usr/lib/anaconda-runtime/boot - cp -af $p/boot/efi/* $p/usr/lib/anaconda-runtime/boot + cp -af $p/boot/efi/EFI/redhat//* $p/usr/lib/anaconda-runtime/boot fi rm -rf $p/boot $p/home $p/root $p/tmp |