diff options
author | Jeremy Katz <katzj@redhat.com> | 2001-12-27 07:58:30 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2001-12-27 07:58:30 +0000 |
commit | 3e3fa37568ba42e5a171024e28f79bffff19d409 (patch) | |
tree | 186525b528d06c95d0859dd53cc98cd8cc7ad715 /scripts/mk-images.s390 | |
parent | d30d6e9a1208be0e0e5d90e07e9ea66fbcdd800d (diff) | |
download | anaconda-3e3fa37568ba42e5a171024e28f79bffff19d409.tar.gz anaconda-3e3fa37568ba42e5a171024e28f79bffff19d409.tar.xz anaconda-3e3fa37568ba42e5a171024e28f79bffff19d409.zip |
and now the parts of the scripts changes that are mergable.after.390.merge
WOOHOO! s/390 is now pretty much merged to HEAD except for the bits
of mail I'm about to send out
Diffstat (limited to 'scripts/mk-images.s390')
-rw-r--r-- | scripts/mk-images.s390 | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index a64360ec7..4c180fef1 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -37,20 +37,29 @@ prepareBootImage() { IDEMODS="" SCSIMODS="" -#SECSTAGE="raid0 raid1 raid5 ext3 $IDEMODS $SCSIMODS " -SECSTAGE="$IDEMODS $SCSIMODS " +SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5" -COMMONMODULES="vfat" +COMMONMODULES="loop cramfs dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod tape390 isofs ext3" LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS" -NETWORKMODULES="$COMMONMODULES nfs ctc netiucv" +NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6" +echo "In mk-images.s390: kernelvers is $kernelvers" +if [ "$kernelvers" = "BOOT" ]; then + makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \ + --initrdsize 8192 \ + --loaderbin loader \ + --modules "$NETWORKMODULES" + cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img +fi -makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \ - --initrdsize 6000 \ +if [ "$kernelvers" = "BOOTtape" ]; then + makeinitrd --initrdto $TOPDESTPATH/images/tapeinrd.img \ + --initrdsize 8192 \ --loaderbin loader \ --modules "$NETWORKMODULES" + cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img +fi -#for I in $BOOTDISKDIR; do for I in `find $BOOTDISKDIR -type d`; do BOOTLANG=`basename $I` BOOTDIR=`basename $I | cut -d'_' -f1` @@ -61,14 +70,19 @@ for I in `find $BOOTDISKDIR -type d`; do fi done -#makedriverdisk --padsize 1440 "Supplemental Drivers" "drivers" "+scsi +net" +#makebootdisk --kernelto $TOPDESTPATH/boot/vmlinuz \ +# --bootdisksize 1440 \ +# --imagename $BOOTDIR/kernel.img #\ +# #--initrd $TOPDESTPATH//autoboot/initrd.img unset BOOTLANG unset BOOTDIR +if [ "$kernelvers" = "BOOT" ]; then makemainmodules "=scsi =net $SECSTAGE" makeinstimage "netstg" "=scsi $SECSTAGE" -#makeinstimage "hdstg" "=net $SECSTAGE" -#makemainimage "stage2" "cramfs" -makemainimage "stage2" "ext2" + +makeinstimage "hdstg" "=net $SECSTAGE" +makemainimage "stage2" "cramfs" +fi |