Changeset 3766 in MondoRescue

Timestamp:

Jun 17, 2020, 2:10:41 AM (4 years ago)

Author:

Bruno Cornec

Message:

Remove extra spaces (Christian Werner <Christian.Werner_at_t-online.de>

File:

• branches/3.3/mindi/mindi (modified) (26 diffs)

branches/3.3/mindi/mindi

@@ -63 +63 @@
     # If "yes", mindi will modify isolinux.cfg for the Xen kernel.
 xenkernelpath=""
- 
+
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
@@ -179 +179 @@
 # Should be declared here as used immediately below potentialy
 MindiExit() {
-    LogFile "INFO: Mindi $MINDI_VERSION is exiting" 
-    LogFile "INFO: End date : `date`" 
+    LogFile "INFO: Mindi $MINDI_VERSION is exiting"
+    LogFile "INFO: End date : `date`"
     if [ _"$MONDO_SHARE" != _"" ] ; then
         echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
@@ -380 +380 @@
                 rmdir $outdir$resolved > /dev/null 2> /dev/null
                 ln -sf $vanilla_resolved_name $outdir$resolved
-                LogFile "INFO: Excluding deps $resolved" 
+                LogFile "INFO: Excluding deps $resolved"
                 grep -Fvx "$resolved" "$filelist" > $filelist.tmp
-                LogFile "INFO: Replacing it with $vanilla_resolved_name" 
+                LogFile "INFO: Replacing it with $vanilla_resolved_name"
                 echo "$vanilla_resolved_name" >> $filelist.tmp
                 mv -f $filelist.tmp $filelist
@@ -526 +526 @@
     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib64/syslinux/modules/bios/ldlinux.c32
     #[ ! -e "$LDLINUXC32" ] && LDLINUXC32=`find / -name ldlinux.c32 | grep -x "/.*/ldlinux.c32"`
-    if [ ! -e "$LDLINUXC32" ]; then 
+    if [ ! -e "$LDLINUXC32" ]; then
         LogFile "INFO: If you use syslinux 5.x, you may miss ldlinux.c32. If your syslinux RPM doesn't include ldlinux.c32, you may want to download another one"
         LDLINUXC32=/tmp/itdoesntexist
@@ -811 +811 @@
         lvUseFilesystem="cramfs"
     else
-        # In that case, we are most probably after 2.6.30 and use the supported initramfs 
+        # In that case, we are most probably after 2.6.30 and use the supported initramfs
         LogFile "WARNING: No automatic detection found previously. Supposing initramfs."
         LogFile "WARNING: Report on the MondoRescue mailing-list with your log files and the result of"
@@ -829 +829 @@
 # $1: raid device (/dev/md...)
 GetRaidDevMembers() {
-    if [ ! -f /etc/raidtab ]; then 
+    if [ ! -f /etc/raidtab ]; then
         return
     fi
@@ -885 +885 @@
 
 #
-# Critical function which computes all dependencies (dyn. lib.) 
+# Critical function which computes all dependencies (dyn. lib.)
 # for a list of binaries
 #
@@ -905 +905 @@
             fi
         else
-            deps="$deps $fname" 
+            deps="$deps $fname"
         fi
     done
@@ -953 +953 @@
 LogProgress() {
     local i progress modres noof_lines title
- 
+
     progress=$1
     noof_lines=$2
@@ -965 +965 @@
     fi
 
-    if [ _"$MONDO_SHARE" != _"" ]; then 
+    if [ _"$MONDO_SHARE" != _"" ]; then
         echo "$title        $i%"
     else
@@ -1140 +1140 @@
     
             # 3rd try, which works on a standard partition (ext2/3), but not on swap
-            # For LVM gives a /dev/mapper entry 
+            # For LVM gives a /dev/mapper entry
             if [ "x$actual_dev" = "x" ]; then
                 actual_dev=`/bin/mount -l | grep "\[$redhat_label\]" | cut -d' ' -f1`
             fi
     
-            # 4th try, with vol_id 
+            # 4th try, with vol_id
             # SWAP only
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
@@ -1220 +1220 @@
             fi
     
-            # 3th try, with vol_id 
+            # 3th try, with vol_id
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
                 list_dev=`mount | grep -E '^/' | $AWK '{ print $1 }' `
@@ -1316 +1316 @@
         # the former is then a link to the latter, so we test whether
         # $current_partition is actually such a link or not and set
-        # $current_lvolume accordingly. On Debian you may find more than one answer 
+        # $current_lvolume accordingly. On Debian you may find more than one answer
         # so we remove the one corresponding to /dev/.static
         # On RedHat even if the device name is different (/dev/mapper/<VG><LV>), the
@@ -1338 +1338 @@
             fi
         fi
-        # 
+        #
         # End of LVM device style variation code (other than $current_lvolume).
 
@@ -1453 +1453 @@
         fi
     done
-    LogAll "-----------------------------------" 
+    LogAll "-----------------------------------"
 
     # Manages potential btrfs subvol partitions so they can be restored
@@ -1476 +1476 @@
         sep=`btrfs subvolume list -a / | grep FS_TREE | sed 's/.*<FS_TREE>\/\(.*\)/\1/'`
         echo "btrfs subvolume create /mnt/RESTORING/$sep" >> $MINDI_TMP/create-btrfs-subvol
-        while read dev mp type opt dum dum; do 
+        while read dev mp type opt dum dum; do
             echo $dev | grep -qE 'UUID|LABEL'
             if [ $? -eq 0 ]; then
@@ -1596 +1596 @@
         cp -f $j $k 2>> $LOGFILE || LogAll "Failed to copy $j to $k"
         cp -f $j $MINDI_TMP 2>> $LOGFILE || LogAll "Failed to copy $j to $MINDI_TMP"
-        if [ _"$MONDO_SHARE" != _"" ]; then 
+        if [ _"$MONDO_SHARE" != _"" ]; then
             cp -f $j $MONDO_ROOT 2>> $LOGFILE || LogAll "Failed to copy $j to $MONDO_ROOT"
         fi
@@ -1643 +1643 @@
 if [ "$ARCH" != "ia64" ] ; then
     if [ $KERNEL_IS_XEN = "yes" ]; then
-        FindMboot32Binary 
+        FindMboot32Binary
         cp $xenkernelpath $MINDI_TMP/target/xen.gz 2>> $LOGFILE
         if [ $? -ne 0 ] ; then
@@ -1659 +1659 @@
 MakeMessageFile $MINDI_TMP/target/$tbc | cut -c1-80 > $MINDI_TMP/target/$tbc/message.txt
 
-if [ _"$MONDO_SHARE" != _"" ]; then 
+if [ _"$MONDO_SHARE" != _"" ]; then
     cp -rf $MINDI_TMP/target/$tbc $MONDO_ROOT 2>> $LOGFILE
     if [ $? -ne 0 ] ; then
@@ -2412 +2412 @@
         cp -Rdf $MONDO_SHARE/restore-scripts/etc/* $bigdir/etc 2>> $LOGFILE
     fi
-    if [ -d "/lib/dev-state" ]; then 
+    if [ -d "/lib/dev-state" ]; then
         cp -a /lib/dev-state $bigdir/lib/ 2>> $MINDI_TMP/$$.log || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
@@ -2428 +2428 @@
     fi
     if [ $LVM != "false" ]; then
-        $MINDI_LIB/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm 
+        $MINDI_LIB/analyze-my-lvm > $bigdir/tmp/i-want-my-lvm
         if [ $? -ne 0 ]; then
             LVM="false"
@@ -2757 +2757 @@
     rdz_fname=$MINDI_TMP/initrd.img
     kernelsize=`du -sk $kernelpath | cut -f1`
-    res=0 
+    res=0
     templog=$MINDI_TMP/$$.log
     > $templog
@@ -2820 +2820 @@
 
     # Handle the case where busybox and mount are dynamically linked
-    file $MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | grep -q "dynamically" 
+    file $MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | grep -q "dynamically"
     if [ $? -eq 0 ]; then
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
@@ -2890 +2890 @@
         cp -rp $MINDI_CACHE/bkphw $targetdir
         if [ -f $MINDI_CACHE/tools.files ]; then
-            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
+            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files`
             LocateDeps $lis > $MINDI_TMP/tools.lis
             tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> $templog | (cd $targetdir ; tar xf -) || LogAll "ERROR: Problem in tools.lis analysis" $templog
@@ -3307 +3307 @@
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | $AWK '{print $1}'`"
 fi
-LogFile "-------------" 
+LogFile "-------------"
 LogFile "FORCE_MODS:"
 LogFile "-------------"
@@ -3413 +3413 @@
 
 #
-# If we have a USB device we need to store info 
+# If we have a USB device we need to store info
 # and remove it from the parameters line
 #