summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2000-06-14 08:03:05 +0000
committerMatt Wilson <msw@redhat.com>2000-06-14 08:03:05 +0000
commit7e6b9c75899ddb819df29d9d93cf9b6c9c156604 (patch)
tree67829614fe342d29b531905baf356c3ec5883230
parent1700d02dcffab730fd43407a40eead4a18108a2c (diff)
downloadanaconda-7e6b9c75899ddb819df29d9d93cf9b6c9c156604.tar.gz
anaconda-7e6b9c75899ddb819df29d9d93cf9b6c9c156604.tar.xz
anaconda-7e6b9c75899ddb819df29d9d93cf9b6c9c156604.zip
use new one shot option to runroot so we don't run these scripts multiple times
-rwxr-xr-xscripts/buildinstall2
-rwxr-xr-xscripts/upd-instroot4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall
index 0c398abcc..55233c648 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -46,7 +46,7 @@ if [ $BUILDARCH = "sparc" ]; then
fi
if [ -x /usr/bin/runroot ]; then
- runroot dist-7.0 --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH"
+ runroot dist-7.0 --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH"
else
$MK_IMAGES $p/RedHat/RPMS $p $p/image-template $BUILDARCH
fi
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 104b135c5..f7caeab2e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -480,7 +480,7 @@ for p in $DEST $DESTGR; do
if [ -x /usr/bin/runroot ]; then
REALPATH=`(cd $p; /bin/pwd)`
- runroot dist-7.0 --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/scrubtree $REALPATH"
+ runroot dist-7.0 --onlyone --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/scrubtree $REALPATH"
else
$p/usr/lib/anaconda-runtime/scrubtree $p
fi
@@ -524,7 +524,7 @@ cd -
echo -n -e "Removing unused python files in hdimage... "
if [ -x /usr/bin/runroot ]; then
REALPATH=`(cd $DEST; /bin/pwd)`
- runroot dist-7.0 --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/pythondeps $REALPATH"
+ runroot dist-7.0 --onlyone --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/pythondeps $REALPATH"
else
$DEST/usr/lib/anaconda-runtime/pythondeps $DEST
fi