seems fine to me -- Martin Gracik ----- "Chris Lumens" <clumens@xxxxxxxxxx> wrote: > --- > scripts/scrubtree | 4 ++-- > scripts/upd-instroot | 21 --------------------- > 2 files changed, 2 insertions(+), 23 deletions(-) > > diff --git a/scripts/scrubtree b/scripts/scrubtree > index 26c67f3..66cf2e9 100755 > --- a/scripts/scrubtree > +++ b/scripts/scrubtree > @@ -46,10 +46,10 @@ touch $p/etc/ld.so.conf > mkdir $p/proc > mount -t proc proc $p/proc > echo /usr/kerberos/$LIBDIR > $p/etc/ld.so.conf > -(cd $p; /usr/sbin/chroot $p usr/sbin/ldconfig ) > +(cd $p; /usr/sbin/chroot $p /sbin/ldconfig ) > > if [ $ARCH != s390 -a $ARCH != s390x ]; then > - rm -f $p/usr/sbin/ldconfig > + rm -f $p/sbin/ldconfig > fi > rm $p/etc/ld.so.conf > > diff --git a/scripts/upd-instroot b/scripts/upd-instroot > index 5a5ee42..591730e 100755 > --- a/scripts/upd-instroot > +++ b/scripts/upd-instroot > @@ -1123,27 +1123,6 @@ if [ -f $DEST/bin/gawk ]; then > ln -sf $DEST/bin/gawk awk > fi > > -[ -d $DEST/bin ] || die "ERROR: directory missing: $DEST/bin" > -[ -d $DEST/sbin ] || die "ERROR: directory missing: $DEST/sbin" > -(cd $DEST/bin; find) | (cd $DEST/bin; /bin/cpio --quiet -pdmu > $DEST/usr/bin) > -(cd $DEST/sbin; find) | (cd $DEST/sbin; /bin/cpio --quiet -pdmu > $DEST/usr/sbin) > -rm -rf $DEST/bin > -rm -rf $DEST/sbin > - > -# Fix relative links like /usr/bin/udevinfo -> ../../sbin/udevadm > -for brokenlink in $(find $DEST/usr/{bin,sbin} -follow -lname '*') ; > do > - target="$(readlink $brokenlink)" > - for pathbit in bin sbin; do > - # if it starts with "../../sbin/", remove that > - newtarget="${target##../../$pathbit/}" > - # if we removed something, replace it with the proper path > - if [ "$newtarget" != "$target" ]; then > - # make it ../sbin/ instead > - ln -sf "../$pathbit/$newtarget" "$brokenlink" > - fi > - done > -done > - > # copy bootloader files for sparc > if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then > mkdir -p $DEST/usr/share/anaconda/boot > -- > 1.7.1.1 > > _______________________________________________ > Anaconda-devel-list mailing list > Anaconda-devel-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/anaconda-devel-list _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list