Changeset 1786 in MondoRescue

Timestamp:

Nov 12, 2007, 4:28:35 PM (18 years ago)

Author:

Bruno Cornec

Message:

Do busybox ldd first in order to create a potential /lib64 link correctly and then use it later in the image

File:

• branches/2.2.5/mindi/mindi (modified) (5 diffs)

branches/2.2.5/mindi/mindi

@@ -1708 +1708 @@
         LogIt "Failed to create ISO image."
     else
-        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
+        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" | tee -a $LOGFILE
     fi
     rm -f $MINDI_TMP/mkisofs.log
@@ -1718 +1718 @@
     local i old_pwd
     if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
-        echo "Shall I make a bootable USB image ? (y/[n] "
+        echo -n "Shall I make a bootable USB image ? (y/[n]) "
         read i
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
@@ -2805 +2805 @@
     mkdir -p tmp
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
+
+    # Handle the case where busybox is dynamically linked
+    # Should be done first so that if /lib64 is a link, it's
+    # created first like that, instead of as a real dir later on
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
+        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
+        rm -f $MINDI_TMP/busy.lis
+    fi
 
     # Management of udev (which includes modprobe in rules)
@@ -2838 +2848 @@
         fi
     fi
+
     # Management of potential HW info (Proliant only at the moment)
     mindi-bkphw $CACHE_LOC $MINDI_CONF | tee -a $LOGFILE
@@ -2865 +2876 @@
     cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
 
-    # Handle the case where busybox is dynamically linked
-    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
-    if [ $? -eq 0 ]; then
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
-        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        rm -f $MINDI_TMP/busy.lis
-    fi
     cd $old_pwd
     echo -en "..."