diff options
| author | Bill Nottingham <notting@redhat.com> | 2001-04-19 17:57:51 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2001-04-19 17:57:51 +0000 |
| commit | ccdce8ffee3ae1e7ad87f049565493ba9a9c3741 (patch) | |
| tree | 8925020a38f14ec94d04c3ef0687ad33942cee6e | |
| parent | 7fdd6ccbee6a8e0b2773d7c1e5ee7b56b8832fca (diff) | |
| download | anaconda-ccdce8ffee3ae1e7ad87f049565493ba9a9c3741.tar.gz anaconda-ccdce8ffee3ae1e7ad87f049565493ba9a9c3741.tar.xz anaconda-ccdce8ffee3ae1e7ad87f049565493ba9a9c3741.zip | |
merge in ia64 script changes here as well
| -rw-r--r-- | scripts/mk-images.ia64 | 17 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 14 |
2 files changed, 26 insertions, 5 deletions
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 993d27996..236a283fc 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -3,20 +3,31 @@ USBMODS="usb-uhci hid keybdev" LATEUSBMODS="mousedev" SECSTAGE="nfs fat vfat raid0 raid1 raid5 $LATEUSBMODS" -NETMODULES="3c59x acenic e100 e1000 eepro100 sk98lin starfire tulip yellowfin" -SCSIMODULES="DAC960 cciss cpqarray aic7xxx megaraid qla1280 qla2x00 sym53c8xx" +NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin" +SCSIMODULES="DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2x00 sym53c8xx" IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd" prepareBootImage() { - gunzip < $BOOTDISKDIR/bootfs.gz > $MBD_TMPIMAGE + 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 + cp -a $IMGPATH/boot/efi/* $MBD_BOOTTREE/ cp $KERNELROOT/boot/efi/vmlinux-* $MBD_BOOTTREE/vmlinux + echo > $MBD_BOOTTREE/elilo.conf << EOF +timeout=5 + +image=vmlinux + label=linux + read-only + initrd=initrd.img +EOF } makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinux \ --imagename boot.img \ + --bootdisksize 10240 \ --initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \ --initrdsize 8192 \ --loaderbin loader \ diff --git a/scripts/upd-instroot b/scripts/upd-instroot index e2cce6db3..c23b9c2b1 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -95,7 +95,7 @@ if [ $ARCH = i386 ]; then fi if [ $ARCH = ia64 ]; then - PACKAGES="$PACKAGES slang" + PACKAGES="$PACKAGES elilo slang" fi # xpm is missing @@ -143,11 +143,13 @@ if [ $ARCH = alpha ]; then fi if [ $ARCH = ia64 ]; then - PACKAGESGR="$PACKAGESGR slang" + PACKAGESGR="$PACKAGESGR elilo slang" fi KEEPFILE=/tmp/keepfile.$$ cat > $KEEPFILE <<EOF +boot/efi/elilo.efi +boot/efi/efi/boot/bootia64.efi bin/ash bin/fdisk* bin/mkfs* @@ -231,6 +233,8 @@ EOF KEEPFILEGR=/tmp/keepfilegr.$$ cp $KEEPFILE $KEEPFILEGR cat >> $KEEPFILEGR <<EOF +boot/efi/elilo.efi +boot/efi/efi/boot/bootia64.efi bin/bash bin/cat bin/chmod @@ -564,6 +568,12 @@ for p in $DEST $DESTGR; do mkdir -p $p/usr/lib/anaconda-runtime/boot cp -af $p/boot/bootlx $p/usr/lib/anaconda-runtime/boot fi + + # 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 + fi rm -rf $p/boot $p/home $p/root $p/tmp |