Changeset 3368 in MondoRescue

Timestamp:

Apr 18, 2015, 5:25:42 PM (10 years ago)

Author:

Bruno Cornec

Message:

• White space removal for tabs

Location:

branches/3.2/mindi

Files:

• mindi (modified) (9 diffs)
• rootfs/etc/init.d/rcS (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -123 +123 @@
 # Function to log on screen only
 LogScreen() {
-    if [ -e /dev/stderr ] ; then
-        echo -e "$1" >> /dev/stderr
-    elif [ -e /usr/bin/logger ] ; then
-        /usr/bin/logger -s $1
-    fi
+        if [ -e /dev/stderr ] ; then
+        echo -e "$1" >> /dev/stderr
+    elif [ -e /usr/bin/logger ] ; then
+        /usr/bin/logger -s $1
+    fi
 }
 
@@ -133 +133 @@
 LogFile() {
 
-    echo -e "$1" >> $LOGFILE
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
+    echo -e "$1" >> $LOGFILE
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
 }
 
 # Function to log in both screen and logfile
 LogAll() {
-    LogScreen "$1"
-    LogFile "$1" "$2"
+    LogScreen "$1"
+    LogFile "$1" "$2"
 }
 
@@ -983 +983 @@
 # Get PV's for an LV
 GetPVsForLV() {
-  if [ -n "$1" ]; then
-    vg=`$LVMCMD lvdisplay $1 2>/dev/null |awk '/VG Name/{print $NF;exit}'`
-    if [ -z "$vg" ]; then
-      return
-    fi
-    $LVMCMD vgdisplay -v $vg 2>/dev/null | awk '/PV Name/{print $NF}'
-  fi
+    if [ -n "$1" ]; then
+        vg=`$LVMCMD lvdisplay $1 2>/dev/null |awk '/VG Name/{print $NF;exit}'`
+        if [ -z "$vg" ]; then
+            return
+        fi
+        $LVMCMD vgdisplay -v $vg 2>/dev/null | awk '/PV Name/{print $NF}'
+    fi
 }
 
@@ -1302 +1302 @@
                 partition_size=`grep -Fv "Priority" /proc/swaps | tr -s '\t' ' ' | grep -F "$current_partition " | $AWK '{print $3}'`
                 [ "$partition_mountpt" != "swap" ] && partition_mountpt="swap"
-                [ "$partition_format" != "swap" ] && partition_format="swap"
+                [ "$partition_format" != "swap" ] && partition_format="swap"
                 if [ "$partition_size" = "" ] ; then
-                    totalsize=0
-                    items=0
-                    for i in `tr -s ' ' '\t' < /proc/swaps | grep -Fv "Filename" | cut -f3` ; do
+                    totalsize=0
+                    items=0
+                    for i in `tr -s ' ' '\t' < /proc/swaps | grep -Fv "Filename" | cut -f3` ; do
                         totalsize=$(($totalsize+$i))
                         items=$(($items+1))
-                    done
-                    [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
-                    [ "$partition_size" -lt "125000" ] && partition_size=125000
-                    LogFile "INFO: I'm guessing $c_p is $(($partition_size/1024))MB"
+                    done
+                    [ "$items" -gt "0" ] && partition_size=$(($totalsize/$items)) || partition_size=0
+                    [ "$partition_size" -lt "125000" ] && partition_size=125000
+                    LogFile "INFO: I'm guessing $c_p is $(($partition_size/1024))MB"
                 fi
             else
@@ -1596 +1596 @@
     # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
     if [ "`which dmsetup`" != "" ]; then
-        block_id="`echo $USBPART | sed 's/\/dev\///g'`"
-        if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
-            LogFile "INFO: Removing $block_id from device mapper."
-            sleep 1
-            dmsetup remove $block_id
-        fi
-    fi
+        block_id="`echo $USBPART | sed 's/\/dev\///g'`"
+        if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
+            LogFile "INFO: Removing $block_id from device mapper."
+            sleep 1
+            dmsetup remove $block_id
+        fi
+    fi
     echo -en "."
     LogFile "INFO: Creating a vfat filesystem on $USBPART"
@@ -1969 +1969 @@
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
-         
+
     retval=0
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
@@ -2269 +2269 @@
     duff_kernels=""
     output=""
-   
+
     if [ "$ARCH" = "ia64" ] ; then
        root="/boot/efi/efi"
@@ -2793 +2793 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done
-        LogFile "      ...done."
+        LogFile "      ...done."
     else
         Die "Filesystem $gvFileSystem not supported for initrd image. Terminating."
@@ -2890 +2890 @@
 
 if ! which mkfs.vfat 1> /dev/null 2> /dev/null ; then
-    Die "mkfs.vfat missing from your filesystem - please install your dosfstools RPM or DEB package. Perhaps your PATH environmental variable is broken, too?"
+    Die "mkfs.vfat missing from your filesystem - please install your dosfstools RPM or DEB package. Perhaps your PATH environmental variable is broken, too?"
 fi
 

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -371 +371 @@
 
 CreateDevMakedev() {
-  if [ -e /sbin/MAKEDEV ]; then
-    ln -sf /sbin/MAKEDEV /dev/MAKEDEV
-  else
-    ln -sf /bin/true /dev/MAKEDEV
-  fi
+    if [ -e /sbin/MAKEDEV ]; then
+        ln -sf /sbin/MAKEDEV /dev/MAKEDEV
+    else
+        ln -sf /bin/true /dev/MAKEDEV
+    fi
 }