Changeset 794 in MondoRescue for trunk/mindi

Timestamp:

Sep 14, 2006, 1:05:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r781:793 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• README (modified) (1 diff)
• mindi (modified) (2 diffs)

trunk/mindi/README

@@ -50 +50 @@
 
 Apart from the above-mentioned documentation, there is a Wiki with growing
-contents at the following URL: http://www.mondorescue.org/cgi-bin/trac.cgi/wiki
+contents at the following URL: http://trac.mondorescue.org
 
 Also, there is a mailing list mondo-devel@lists.sourceforge.net. Please go to

trunk/mindi/mindi

@@ -1459 +1459 @@
             fi
 
-            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
+            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
+            # LABEL=SW-cciss/c0d0p3 (RDP)
             # SWAP only
-            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
+            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
                 try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
                 present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
@@ -1497 +1498 @@
             current_lvolume="`find /dev -lname "$current_partition" | grep -Ev '^/dev/\.static/'`"
             echo $current_lvolume | grep -q ' '
-            if [ $? -eq 0]; then
+            if [ $? -eq 0 ]; then
                 echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE  
             fi