Changeset 3686 in MondoRescue for branches/3.3/mondo/src/restore-scripts

Timestamp:

Sep 22, 2017, 2:22:48 AM (8 years ago)

Author:

Bruno Cornec

Message:

Fix wrong spaces

File:

• branches/3.3/mondo/src/restore-scripts/mondo/mr-make-me-bootable (modified) (3 diffs)

branches/3.3/mondo/src/restore-scripts/mondo/mr-make-me-bootable

@@ -6 +6 @@
 
 if [ "$#" -ne "2" ] && [ "$#" -ne "3" ] ; then
-    echo "mr-make-me-bootable <fname> <drive> [noaction]"
-    exit 1
+    echo "mr-make-me-bootable <fname> <drive> [noaction]"
+    exit 1
 fi
 
@@ -24 +24 @@
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
     # Warning wrong if LVM !
-    drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
+    drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
     if [ "$drivetouse" = "$drive" ]; then
         # We can continue as this is the drive we ned to work on
-        partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
-        mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
+        partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
+        mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
 
-        if [ "$mountpt" = "/" ] ; then
-            root_drv=$drive
-            root_part=$partno
-        elif [ "$mountpt" = "/boot" ] ; then
-            boot_drv=$drive
-            boot_part=$partno
-        fi
-    fi
+        if [ "$mountpt" = "/" ] ; then
+            root_drv=$drive
+            root_part=$partno
+        elif [ "$mountpt" = "/boot" ] ; then
+            boot_drv=$drive
+            boot_part=$partno
+        fi
+    fi
 done
 
 if [ "$boot_drv" ] ; then
-    drive=$boot_drv
-    partno=$boot_part
+    drive=$boot_drv
+    partno=$boot_part
 elif [ "$root_drv" ] ; then
-    drive=$root_drv
-    partno=$root_part
+    drive=$root_drv
+    partno=$root_part
 else
-    driveline=`grep -E '[   ]/boot[     ]' $1`
-    [ ! "$driveline" ] && driveline=`grep -E '[     ]/[     ]' $1`
-    partno=`echo "$driveline" | cut -d' ' -f1 | awk -F "[a-z]" '{print $NF;}'`
+    driveline=`grep -E '[   ]/boot[     ]' $1`
+    [ ! "$driveline" ] && driveline=`grep -E '[     ]/[     ]' $1`
+    partno=`echo "$driveline" | cut -d' ' -f1 | awk -F "[a-z]" '{print $NF;}'`
 #    echo "driveline=$driveline --> partno=$partno"
 fi
 
 if [ "$drive" ] ; then
-    if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
-        partno="1"
+    if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
+        partno="1"
     fi
     cmd=""
@@ -61 +61 @@
         # First desactivate active partitions (coming from previous usage)
         cmd="${cmd}a\n$p\n"
-        if [ "$dummy" != "" ] ; then
+        if [ "$dummy" != "" ] ; then
             echo "Will desactivate $p on $drive" >> $LOGFILE
         fi
     done
     # Then activate the one which should
-    if [ "$dummy" != "" ] ; then
+    if [ "$dummy" != "" ] ; then
         echo "Would activate $partno on $drive" >> $LOGFILE
     else