diff options
| author | Erik Troan <ewt@redhat.com> | 2000-05-04 13:40:10 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2000-05-04 13:40:10 +0000 |
| commit | 0c8946498525fc2e3d5350441bd1da7d2dc9bbf5 (patch) | |
| tree | 1c4f22c9652f7bb9dc9b0777c9dd5e47aaced990 /scripts | |
| parent | 5f10ca28bb8d7fda12f5b3880a010c64711b1df5 (diff) | |
| download | anaconda-0c8946498525fc2e3d5350441bd1da7d2dc9bbf5.tar.gz anaconda-0c8946498525fc2e3d5350441bd1da7d2dc9bbf5.tar.xz anaconda-0c8946498525fc2e3d5350441bd1da7d2dc9bbf5.zip | |
added --kernelto and --initrdto options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 2 | ||||
| -rwxr-xr-x | scripts/mk-images | 24 | ||||
| -rw-r--r-- | scripts/mk-images.i386 | 8 |
3 files changed, 30 insertions, 4 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 7be493b8a..9610b9044 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -30,7 +30,7 @@ if [ ! -f $MK_IMAGES ]; then fi $UPD_INSTROOT $1/RedHat/RPMS $1/image-template $1/RedHat/instimage -$MK_IMAGES $1/RedHat/RPMS $1/images $1/RedHat/instimage/modules $1/RedHat/base $1/image-template +$MK_IMAGES $1/RedHat/RPMS $1 $1/RedHat/instimage/modules $1/RedHat/base $1/image-template rm -rf $BUILDINSTDIR rm -rf $1/image-template $1/RedHat/instimage/usr/lib/anaconda-runtime diff --git a/scripts/mk-images b/scripts/mk-images index 7fec54df0..dacc4c1c7 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -16,7 +16,8 @@ TOPDIR=$(cd $TOPDIR; pwd) # Set, verify, and create paths KERNELPATH=$1 - IMAGEPATH=$2 + TOPDESTPATH=$2 + IMAGEPATH=$2/images FULLMODPATH=$3 INSTIMGPATH=$4 INSTIMGTEMPLATE=$5 @@ -226,6 +227,17 @@ makemainmodules() { } makebootdisk() { + EXTRAKERNELPATH="" + EXTRAINITRDPATH="" + while [ $(echo $1 | cut -c1-2) = "--" ]; do + if [ $1 = "--kernelto" ]; then + EXTRAKERNELPATH=$2 + shift; shift + elif [ $1 = "--initrdto" ]; then + EXTRAINITRDPATH=$2 + shift; shift + fi + done MBD_FILENAME=$IMAGEPATH/$1 LOADERBIN=$2 MODSET=`expandModuleSet "$3"` @@ -351,6 +363,16 @@ EOF echo "I don't know how big to make the image!" >&2 exit 1 fi + + if [ -n "$EXTRAKERNELPATH" ]; then + mkdir -p $EXTRAKERNELPATH + cp -a $KERNELROOT/boot/vmlinuz-* $EXTRAKERNELPATH/vmlinuz + fi + + if [ -n "$EXTRAINITRDPATH" ]; then + mkdir -p $EXTRAINITRDPATH + cp -a $MBD_FSIMAGE $EXTRAINITRDPATH/initrd + fi rmdir $MBD_BOOTTREE rm -f $MBD_FILENAME diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index f635fa4ab..68c3ce663 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -1,10 +1,14 @@ SECSTAGE="vfat raid0 raid1 raid5" -makebootdisk boot.img loader-local "vfat +makebootdisk --kernelto $TOPDESTPATH/dosutils/autorun \ + --initrdto $TOPDESTPATH/dosutils/autorun \ + boot.img loader-local "vfat AM53C974 ips DAC960 megaraid ncr53c8xx cpqarray aic7xxx BusLogic qlogicisp advansys eata_dma" -makebootdisk bootnet.img loader-network "3c59x ac3200 at1700 de4x5 +makebootdisk --kernelto $TOPDESTPATH/images/pxeboot \ + --initrdto $TOPDESTPATH/images/pxeboot \ + bootnet.img loader-network "3c59x ac3200 at1700 de4x5 de600 de620 depca dgrs eepro100 eepro hp-plus hp hp100 ibmtr ni52 old_tulip tulip ne nfs vfat" |