[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 02/12] No longer do the bin -> usr/bin copy song and dance.



---
 scripts/upd-instroot |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 545fc19..81da487 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1129,27 +1129,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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]