Changeset 3525 in MondoRescue for branches/3.2

Timestamp:

Mar 4, 2016, 12:14:33 AM (9 years ago)

Author:

Bruno Cornec

Message:

Fix issues detected at restore time for mindi standalone

• size_of_all_tool should be computed in PrepareDataDiskImages to be used by further functions
• Fix a bad ref where $mountpoint was again missing
• Also backups directory correctly for udev dependencies

File:

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

branches/3.2/mindi/mindi

@@ -2209 +2209 @@
     fi
 
+    # Here we need to know the ramdisk_size
+    size_of_all_tools=`du -sk $bigdir | cut -f1`
+    export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
+    LogFile "INFO: Ramdisk will be $ramdisk_size KB"
+
     MakeBootConfFile $boottype > $bootconf
 
     echo -en "INFO: Tarring and zipping the data content..."
-    size_of_all_tools=`du -sk $bigdir | cut -f1`
     (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $MINDI_CACHE/all.tar.gz || LogAll "ERROR: Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     LogFile "Size of the data content"
@@ -2596 +2600 @@
 
     # For older distributions expecting /sbin/init provides it
-    if [ ! -e "sbin/init" ]; then
+    if [ ! -e "$mountpoint/sbin/init" ]; then
         (cd $mountpoint/sbin ; ln -sf ../usr/sbin/init .)
     fi
@@ -2641 +2645 @@
                     done
                     lis="$lis $j"
+                elif [ -d $i ]; then
+                    lis3="$lis3 $i"
                 elif [ -f $i ]; then
                     lis="$lis $i"
@@ -2666 +2672 @@
                 fi
             done
+            # But adds the directory useful for udev in $lis3
             fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
             LogFile "INFO: Copying udev related files with cp -a --parents $fnllist -t $mountpoint/"
-            cp -a --parents $fnllist -t $mountpoint/ 2> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
+            cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2864 +2871 @@
 
     if [ "$res" -eq "0" ] ; then
-        echo -en "\rINFO: MakeBootInitFile finished without error.      \n"
+        LogAll "INFO: MakeBootInitFile finished without error."
     else
-        echo -en "\rWARNING: MakeBootInitFile exits WITH ERRORS.           \n"
+        LogAll "WARNING: MakeBootInitFile exits WITH ERRORS."
     fi
     return 0
@@ -3375 +3382 @@
 PrepareDataDiskImages
 
-export ramdisk_size=$(($size_of_all_tools+$EXTRA_SPACE))
-LogFile "INFO: Ramdisk will be $ramdisk_size KB"
-
 MakeBootInitFile $MINDI_LIB/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not create initrd.img"