Changeset 2446 in MondoRescue

Timestamp:

Oct 2, 2009, 4:30:13 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3515@localhost: bruno | 2009-10-02 03:59:06 +0200

• Create a correct minimal boot for tools required. Resulting ISO still not ok due to init.

Location:

branches/2.2.10

Files:

• mindi/deplist.conf (moved) (moved from branches/2.2.10/mindi/deplist.txt )
• mindi/mindi (modified) (9 diffs)
• mindi/mindi-bkphw (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)

branches/2.2.10/mindi/mindi

@@ -35 +35 @@
 
 EXTRA_SPACE=60000       # increase if you run out of ramdisk space
-BOOT_SIZE=16384         # size of the boot disk
+BOOT_SIZE=24576         # size of the boot disk
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -272 +272 @@
 
 DropOptimizedLibraries() {
-    local outdir filelist list_of_optimized_libraries optimized_lib_name vanilla_lib_name reason msg resolved res
+    local outdir filelist list_of_optimized_libraries optimized_lib_name vanilla_lib_name reason msg resolved res progress
     filelist=$1
     outdir=$2
 
+    progress=0
     list_of_optimized_libraries=`grep "lib/i[5-7]86/" $filelist`
     if [ "$list_of_optimized_libraries" = "" ] ; then
         return 0
+    else
+        noof_lines=`echo $list_of_optimized_libraries | tr ' ' '\n' | wc -l`
     fi
     echo -en "Dropping i686-optimized libraries if appropriate"
     for optimized_lib_name in $list_of_optimized_libraries ; do
-        echo -en "."
         reason=""
         vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
@@ -303 +305 @@
             mv -f $filelist.tmp $filelist
         done
+        progress=$(($progress+1))
+        LogProgress $progress $noof_lines
     done
     $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp
@@ -794 +798 @@
 # Give all symlinks recursively of a full path name
 ReadAllLink() {
-    file="$1"
-
-    echo $file | grep -q '\.\./'
-    if [ $? -eq 0 ]; then
-        # We need to normalise the path with .. in it
-        file=`echo $file | perl -pi -e 's|([^/]+)/([^/]+)/\.\./([^/]+)|$1/$3|'`
-    fi
-    echo "$file"
-    if [ ! -h $file ]; then
-        return 0
-    fi
-
-    link=`readlink $file`
-    d=`dirname $file`
-    fchar=`echo $link | cut -c1`
-    # If mother dir is a link print it
-    if [ -h "$d" ]; then
-        echo "$d"
-        d=`readlink $d`
-    fi
-    if [ "$fchar" != "/" ]; then
-        # Relative or local link
-        ReadAllLink "$d/$link" 
-    else
-        # Absolute path
-        ReadAllLink $link 
-    fi
+
+    incoming="$*"
+
+    for file in $incoming ; do
+        echo "$file"
+        if [ ! -h $file ]; then
+            continue
+        fi
+    
+        link=`readlink -e $file`
+        d=`dirname $file`
+        fchar=`echo $link | cut -c1`
+        # If mother dir is a link print it
+        if [ -h "$d" ]; then
+            echo "$d"
+            d=`readlink -e $d`
+        fi
+        if [ "$fchar" != "/" ]; then
+            # Relative or local link
+            ReadAllLink "$d/$link" 
+        else
+            # Absolute path
+            ReadAllLink $link 
+        fi
+    done
 }
 
@@ -2242 +2244 @@
     # We need a minimal conf in the initial ramdisk
     mountlis=`grep -v "^#.*" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | cut -d: -f2 | sort -u`
-    LocateDeps $mountlis >> $MINDI_TMP/busy.lis
+    ReadAllLink $mountlis > $MINDI_TMP/mnt.lis
+    LocateDeps `cat $MINDI_TMP/mnt.lis` >> $MINDI_TMP/deps.lis
     # Special for libs
-    for f in `grep -E "/lib" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | grep -v "^#.*" | cut -d: -f2`; do
-        echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
-    done
+    ReadAllLink `grep -E "/lib" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | grep -v "^#.*" | cut -d: -f2` >> $MINDI_TMP/deps.lis
+
     # Initial / are trucated by tar
-    tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
-    rm -f $MINDI_TMP/busy.lis
+    tar cf - `cat $MINDI_TMP/mnt.lis` `sort -u $MINDI_TMP/deps.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
+    rm -f $MINDI_TMP/deps.lis
 
     # Copy of files mandatory for ssh to automate mount if sshfs is used
@@ -2270 +2272 @@
     if [ $? -eq 0 ]; then
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
-        LogAll "udev device manager found"
+        LogFile "udev device manager found"
         tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogAll "Problem in /etc/udev analysis" $MINDI_TMP/$$.log
         # This avoids NIC remapping if on another machine at restore time on Debian at least
@@ -2287 +2289 @@
                     while [ -h $j ]; do
                         lis="$lis $j"
-                        j=`readlink $j`
+                        j=`readlink -f $j`
                     done
                     lis="$lis $j"
@@ -2486 +2488 @@
 LogFile "$ARCH architecture detected" 
 LogFile "mindi called with the following arguments:" 
-LogFile "$@" 
+LogFile "$*"
 LogFile "Start date : `date`" 
 LogFile "-----------------------------" 
@@ -2695 +2697 @@
     elif [ "$1" = "--readalllink" ] ; then
         [ ! "$2" ] && Die "Please specify the binary to look at"
-        ReadAllLink $2
+        shift
+        ReadAllLink $*
         # Avoids logfile content for mondo
         export MONDO_SHARE=""

branches/2.2.10/mindi/mindi-bkphw

@@ -89 +89 @@
     close(SCRIPT);
 } else {
-    print "WARNING: No Hardware support for $productname. Not a big issue, just less features and risks ;-)\n";
+    print "\nWARNING: No Hardware support for $productname. Not a big issue, just less features and risks ;-)\n";
     print "You may ask your manufacturer to contribute to the mindi project\n";
 }

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -1634 +1634 @@
         log_msg(4, "I guess it's a partiion itself");
         mr_asprintf(partitions[0], "%s", dsf);
-        ndsf = truncate_to_drive_name(dsf);
+        mr_asprintf(tmp, "%s", dsf);
+        ndsf = truncate_to_drive_name(tmp);
+        mr_free(tmp);
     } else {
         /* Fill the partition list */
@@ -1828 +1830 @@
         mount_list = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-:w!
+
         log_msg(4, "  Software raid device list: %s", mount_list);
         /* Loop through the software raid device list to see if we can find the partition */