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/scrubtree | |
| 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/scrubtree')
| -rwxr-xr-x | scripts/scrubtree | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/scrubtree b/scripts/scrubtree index 5f4d6855b..54e891521 100755 --- a/scripts/scrubtree +++ b/scripts/scrubtree @@ -21,7 +21,11 @@ mkdir $p/proc mount -t proc proc $p/proc [ -d $p/usr/X11R6/lib ] && echo /usr/X11R6/lib > $p/etc/ld.so.conf (cd $p; /usr/sbin/chroot $p usr/sbin/ldconfig ) -rm -f $p/usr/sbin/ldconfig $p/etc/ld.so.conf + +if [ $ARCH != s390 -a $ARCH != s390x ]; then + rm -f $p/usr/sbin/ldconfig +fi +rm $p/etc/ld.so.conf (cd $p/usr/bin; ./collage | $p/usr/lib/anaconda-runtime/mkcollagelinks ./collage) |