diff options
| author | Matt Wilson <msw@redhat.com> | 2000-04-12 22:17:11 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-04-12 22:17:11 +0000 |
| commit | 854cc95efd978e6af695c9f7ddb7affb46952bf3 (patch) | |
| tree | 6c33d3996c5d14973cf8802ff278bda359fbab9d /scripts/buildinstall | |
| parent | b77779f5b642cafa55873ab00b7e67cff2324736 (diff) | |
| download | anaconda-854cc95efd978e6af695c9f7ddb7affb46952bf3.tar.gz anaconda-854cc95efd978e6af695c9f7ddb7affb46952bf3.tar.xz anaconda-854cc95efd978e6af695c9f7ddb7affb46952bf3.zip | |
1) fixed rpm2cpio commands
2) set MK_IMAGES properly
Diffstat (limited to 'scripts/buildinstall')
| -rwxr-xr-x | scripts/buildinstall | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 49a6497f5..7f7fccd2b 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -5,7 +5,7 @@ if [ ! -d $1/RedHat/RPMS ]; then exit 1 fi -BUILDINSTDIR=/tmp/buildinstall +BUILDINSTDIR=/tmp/buildinstall.tree rm -rf $BUILDINSTDIR mkdir -p $BUILDINSTDIR @@ -15,7 +15,7 @@ MK_IMAGES=./mk-images if [ ! -f $UPD_INSTROOT ]; then cd $BUILDINSTDIR - rpm2cpio < $1/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio -ivumd usr/lib/anaconda-runtime/upd-instroot + rpm2cpio $1/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd usr/lib/anaconda-runtime/upd-instroot mv usr/lib/anaconda-runtime/upd-instroot . rm -rf usr UPD_INSTROOT=$BUILDINSTDIR/upd-instroot @@ -23,10 +23,10 @@ fi if [ ! -f $MK_IMAGES ]; then cd $BUILDINSTDIR - rpm2cpio < $1/RedHat/RPMS/anaconda-runtime[0-9]-* | cpio -ivumd usr/lib/anaconda-runtime/mk-images + rpm2cpio $1/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd usr/lib/anaconda-runtime/mk-images mv usr/lib/anaconda-runtime/mk-images . rm -rf usr - UPD_INSTROOT=$MK_IMAGES/mk-images + MK_IMAGES=$MK_IMAGES/mk-images fi $UPD_INSTROOT $1/RedHat/RPMS $1 |