Changeset 3197 in MondoRescue for branches/3.2/mindi

Timestamp:

Oct 1, 2013, 10:25:16 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix a last compile error on mondoarchive (now runs till the end)
• Trying to improve again the nightmare brought by the move to usr :-( Still not completely done, but should be better than before (solves partly the init not found issue reported and tested here as well)

File:

• branches/3.2/mindi/mindi (modified) (3 diffs)

branches/3.2/mindi/mindi

@@ -2081 +2081 @@
     includefile=$MINDI_TMP/$$.includefile.txt
 
-    # Check whether /lib64 or /lib is a link and if so explicitly create one in rootfs
-    if [ -h "/lib64" ]; then
-        mkdir -p lib || LogIt "ERROR: Unable to create lib in $mountpoint."
-        if [ ! -h lib64 ]; then
-            ln -s lib lib64 || LogIt "ERROR: /lib64 is a symbolic link, but I couldn't create it in $mountpoint."
-        fi
-    fi
-    if [ -h "/lib" ]; then
-        mkdir -p usr/lib || LogIt "ERROR: Unable to create usr/lib in $mountpoint."
-        mv lib/* usr/lib 2> /dev/null
-        if [ -d "lib" ]; then
-            rmdir lib
-        fi
-    fi
-    # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
-    if [ -h "/sbin" ]; then
-        mkdir -p usr/sbin || LogIt "ERROR: Unable to create usr/sbin in $mountpoint."
-        mv sbin/* usr/sbin 2> /dev/null
-        if [ -d "sbin" ]; then
-            rmdir sbin
-        fi
-    fi
-    if [ -h "/bin" ]; then
-        mkdir -p usr/bin || LogIt "ERROR: Unable to create usr/bin in $mountpoint."
-        mv bin/* usr/bin 2> /dev/null
-        if [ -d "bin" ]; then
-            rmdir bin
-        fi
-    fi
+    # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
+    for d in bin sbin lib lib64; do
+        if [ -h "/$d" ]; then
+            thelink=`readlink /$d`
+            mkdir -p $thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
+            mv $d/* $thelink 2> /dev/null
+            if [ -d "$d" ]; then
+                rmdir $d
+            fi
+            if [ ! -h $d ]; then
+                ln -s $thelink $d || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
+            fi
+        fi
+    done
 
     lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
@@ -2591 +2576 @@
     # recent bash says that -d is true for a link to a dir !
     for f in `sort -u $MINDI_TMP/minimal.lis`; do
-        if [ -e $f -a ! -d $f ] || [ -h $f -a ! -d $f ]; then
+        if [ -e $f -a ! -d $f ] || [ -h $f ]; then
             finallist="$finallist $f"
         fi
@@ -2617 +2602 @@
         rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
-        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [  ! -h "/lib64/udev" ]; then
+        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then
             tar cf - -C / /lib64/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib64/udev analysis" $MINDI_TMP/$$.log
         fi