Changeset 2917 in MondoRescue

Timestamp:

Dec 18, 2011, 2:52:51 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #525 and improve printing when no /etc/raidtab, but still md devices

File:

• branches/3.0/mindi/mindi (modified) (4 diffs)

branches/3.0/mindi/mindi

@@ -785 +785 @@
 # $1: disk device (i.e. /dev/hda1)
 GetParentRaidDev() {
+    if [ ! -f /etc/raidtab ]; then 
+        return
+    fi
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {dev=\$2} /^[[:space:]]*device/ {if(\$2==\"$1\") {print dev; exit}}" < /etc/raidtab
 }
@@ -792 +795 @@
 # $1: raid device (/dev/md...)
 GetRaidDevMembers() {
+    if [ ! -f /etc/raidtab ]; then 
+        return
+    fi
     $AWK "/^[[:space:]]*#/ {next} /^[[:space:]]*raiddev/ {if(dev) exit; if(\$2 == \"$1\") dev=\$2} /^[[:space:]]*device/ {if(dev) {print \$2}}" < /etc/raidtab
 }
@@ -1066 +1072 @@
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
-        # Skip evices, network FS, cisf
+        # Skip fd/cd devices, network FS, cifs
         [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -E "^//"`" != "" ]&& continue
         [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
@@ -2206 +2212 @@
     local devpath drive res stub
     device=$1
+    if [ "`echo "$device" | grep -E "^/dev/"`" = "" ] ; then
+        Die "Cannot find $device's size - is your /etc/fstab sane?"
+    fi
     if [ "`echo "$device" | grep -F "/dev/md"`" != "" ] ; then
         res=`SizeOfRaidPartition $device`