Changeset 3437 in MondoRescue

Timestamp:

Aug 28, 2015, 4:08:48 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Small improvement on label-partitions-as-necessary to avoid too much code duplication

File:

• branches/3.2/mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/3.2/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -58 +58 @@
         elif [ "$format" = "swap" ] ; then
             if [ "$opttun" = "-U" ]; then
-                LogIt "Creating uuid $label on swap partition $mountpt"
-                if [ -x "/sbin/swaplabel" ]; then
-                    /sbin/swaplabel $opttun $label $mountpt
+                typelabel="UUID"
+            else
+                typelabel="Label"
+            fi
+            if [ -x "/sbin/swaplabel" ]; then
+                # Better choice
+                command="/sbin/swaplabel $opttun $label $mountpt"
+            else
+                if [ "$opttun" = "-U" ]; then
+                    LogIt "Really running dd conv=notrunc of=$mountpt obs=1 seek=1036"
+                    echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                    command=/bin/true
                 else
-                    echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                    command="mkswap -f $opttun $label $mountpt"
                 fi
-            else
-                if [ -x "/sbin/swaplabel" ]; then
-                    command="/sbin/swaplabel $opttun $label $mountpt"
-                else
-                    command="mkswap $opttun $label $mountpt"
-                fi
-                LogIt "Running $command"
-                $command
             fi
+            LogIt "Creating $typelabel $label on swap partition $mountpt"
+            LogIt "Running $command"
+            $command
         else
             LogIt "I am NOT going to run tune2|4fs/reiserfstune: the partition is format '$format', which doesn't like tune2|4fs/reiserfstune anyway"