Changeset 789 in MondoRescue

Timestamp:

Sep 13, 2006, 3:27:17 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a bug for swap labelled partition created by Altiris RDP (reported by michael.shapiro_at_hp.com)

File:

• branches/stable/mindi/mindi (modified) (1 diff)

branches/stable/mindi/mindi

@@ -1407 +1407 @@
             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`"