diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-06-06 16:33:31 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-06-06 16:33:31 +0000 |
commit | e0779b7bf137a60bf6e6cd3adee4aabffcd28c73 (patch) | |
tree | 20b8340a621390a3fc967ef5fb3723c78b4033c7 /scripts/mk-images.s390 | |
parent | 91d5fc40d23a5fb5b225287090e8074d0054fa6e (diff) | |
download | anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.tar.gz anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.tar.xz anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.zip |
merge taroon branch. mostly package bits, but a lot of other misc stuff
and cleanups in here too
Diffstat (limited to 'scripts/mk-images.s390')
-rw-r--r-- | scripts/mk-images.s390 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index 821447a96..e428d4284 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -159,6 +159,9 @@ EOF cp -f $IMGPATH/usr/bin/login $MBD_DIR/sbin/login cp -f $IMGPATH/usr/sbin/sshd $MBD_DIR/sbin/sshd + # set up the arch bits + echo $arch > $MBD_DIR/etc/arch + install -s -m 755 $LOADERBINDIR/$LOADERBIN $MBD_DIR/sbin/loader install -s -m 755 $LOADERBINDIR/shutdown $MBD_DIR/sbin/shutdown #install -s -m 755 $LOADERBINDIR/load_anaconda $MBD_DIR/sbin/loader @@ -434,25 +437,14 @@ SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5 lvm-mod" 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 ipv6" +NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6 lcs" makeBootImages() { - echo "In mk-images.s390: kernelvers is $kernelvers" - if [ "$kernelvers" = "" ]; then makeS390initrd --initrdto $TOPDESTPATH/images/initrd.img \ --initrdsize 15000 \ --loaderbin loader \ --modules "$NETWORKMODULES" cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img - fi - - if [ "$kernelvers" = "tape" ]; then - makeS390initrd --initrdto $TOPDESTPATH/images/tapeinrd.img \ - --initrdsize 15000 \ - --loaderbin loader \ - --modules "$NETWORKMODULES" - cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img - fi } makeSecondStage() { |