Changeset 3147 in MondoRescue for branches/3.1/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (3 diffs)

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

@@ -28 +28 @@
     else
         if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
-            command="tune2fs $opttun $label $mountpt"
+            if [ "$format" = "ext4" ] && [ -x "/sbin/tune4fs" ]; then
+                command="/sbin/tune4fs $opttun $label $mountpt"
+            else
+                command="tune2fs $opttun $label $mountpt"
+            fi
             LogIt "Running $command"
             $command
@@ -38 +42 @@
             if [ "$opttun" = "-U" ]; then
                 LogIt "Creating uuid $label on swap partition $mountpt"
-                echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                if [ -x "/sbin/swaplabel" ]; then
+                    /sbin/swaplabel $opttun $label $mountpt
+                else
+                    echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                fi
             else
-                command="mkswap $opttun $label $mountpt"
+                if [ -x "/sbin/swaplabel" ]; then
+                    command="/sbin/swaplabel $opttun $label $mountpt"
+                else
+                    command="mkswap $opttun $label $mountpt"
+                fi
                 LogIt "Running $command"
                 $command
             fi
         else
-            LogIt "I am NOT going to run tune2fs/reiserfstune: the partition is format '$format', which doesn't like tune2fs/reiserfstune anyway"
+            LogIt "I am NOT going to run tune2|4fs/reiserfstune: the partition is format '$format', which doesn't like tune2|4fs/reiserfstune anyway"
         fi
     fi
@@ -53 +65 @@
 # ---------------------------------------------
 
-LogIt "Identifying your drives with tune2fs"
+LogIt "Identifying your drives with FS tune tool"
 if [ "$#" -ne "1" ] ; then
     LogIt "label-partitions-as-necessary $MINDI_CACHE/mountlist.txt < /tmp/fstab.new" 1