Changeset 3488 in MondoRescue for branches

Timestamp:

Dec 3, 2015, 3:07:55 AM (8 years ago)

Author:

Bruno Cornec

Message:

• mr-label now works for setupping UUIDs and is called in mondorestore postprocessing accordingly. Fix #778.

Location:

branches/3.2

Files:

• MondoRescue/bin/mr-label (modified) (4 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/3.2/MondoRescue/bin/mr-label

@@ -27 +27 @@
 =head1 SYNOPSIS
 
-mr-label [-v][-h][-l label] device|file
+mr-label [-v][-h][-L LABEL|-U UUID] device|file
 
 =head1 ARGUMENTS
@@ -55 +55 @@
 Prints the manual page and exits.
 
-=item B<-l label> 
+=item B<-L LABEL> 
 
-This is the new label to put on the VFAT filesystem
+This is the new LABEL to put on the VFAT filesystem
+
+=item B<-U UUID> 
+
+This is the new UUID to put on the VFAT filesystem
 
 =back
@@ -92 +96 @@
         "man" => \$opts{'man'},
         "verbose|v+" => \$opts{'v'},
-        "label|l=s" => \$opts{'l'},
+        "label|L=s" => \$opts{'L'},
+        "uuid|U=s" => \$opts{'U'},
 ) || pb_syntax(-1,0);
 
@@ -107 +112 @@
 pb_temp_init($pbdebug);
 
-my $label=$opts{'l'};
-die "Unable no label defined, use -l label" if (not defined $label);
+my $label=$opts{'L'};
+my $uuid=$opts{'U'};
+die "Unable no label/uuid defined" if ((not defined $label) && (not defined $uuid));
 
 my $inputf  = $ARGV[0];
 die "$0: no input file defined" if (not defined $inputf);
 
-my($inputfh, $buffer);
+my($inputfh, $buffer, $offset, $length, $hexlabel, $newbuf);
 open($inputfh,  "+< $inputf") || die "$0: cannot open $inputf for reading/writing: $!";
 binmode($inputfh) || die "binmode failed: $!";
 
-# 42 first bytes are untouched
-if (! seek($inputfh, 43,0)) {
+if (defined $label) {
+    # 42 first bytes are untouched
+    $offset = 43;
+    $length = 11;
+} elsif (defined $uuid) {
+    # 38 first bytes are untouched
+    $offset = 39;
+    $length = 4;
+    $newbuf = "";
+} else {
+    die "Nothing to do no label/uuid defined";
+}
+
+if (! seek($inputfh, $offset,0)) {
     die "Unable to seek $inputf: $!";
 }
+# then read the following bytes
+my $size = read($inputfh, $buffer, $length);
+if ($size != $length) {
+    die "Unable to read existing label/uuid: $!";
+}
 
-# Label is then the 11 following bytes
-my $size = read($inputfh, $buffer, 11);
-if ($size != 11) {
-    die "Unable to read existing label: $!";
+if (defined $label) {
+    pb_log(1,"Previous label was ***$buffer***\n");
+} elsif (defined $uuid) {
+    my ($hex) = unpack( 'H*', $buffer );
+    #for my $d (split('',$buffer)) {
+    #pb_log(1,"Char analyzed: ".hex($d)."\n");
+    #$newbuf = $d.$newbuf;
+    #}
+    pb_log(1,"Previous hex was ***$hex***\n");
+    my @loc = ($hex =~ m/../g);
+    print Dumper(@loc);
+    $hex = join('',reverse(@loc));
+    pb_log(1,"Previous uuid was ***$hex***\n");
+} else {
+    die "Nothing to do no label/uuid defined";
 }
-pb_log(1,"Previous label was ***$buffer***\n");
-my $hexlabel=sprintf("%-11s", uc($label));
-pb_log(1,"New label is ***$hexlabel***\n");
+    
+if (defined $label) {
+    $hexlabel=sprintf("%-11s", uc($label));
+    pb_log(1,"New label is ***$hexlabel***\n");
+} elsif (defined $uuid) {
+    pb_log(1,"New uuid is ***$uuid***\n");
+    my @loc = ($uuid =~ m/../g);
+    my $hex = join('',reverse(@loc));
+    ($hexlabel) = pack( 'H*', $hex );
+} else {
+    die "Nothing to do no label/uuid defined";
+}
 # Go back
-seek($inputfh, 43,0);
+seek($inputfh, $offset,0);
 print $inputfh $hexlabel;
 close($inputfh) || die "couldn't close $inputf: $!";

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

@@ -57 +57 @@
             $command
         elif [ "$format" = "fat" ] || [ "$format" = "vfat" ]; then
-            if [ -x "/sbin/fatlabel" ]; then
-                command="/sbin/fatlabel $mountpt $label"
-                LogIt "Running $command"
-                $command
+            if [ "$opttun" = "-U" ]; then
+                if [ -x "/usr/bin/mr-label" ]; then
+                    command="/usr/bin/mr-label -U $label $mountpt"
+                    LogIt "Running $command"
+                    $command
+                else
+                    LogIt "No command available to update a UUID of a FAT/VFAT FS"
+                fi
             else
-                LogIt "No fatlabel command available to label a FAT/VFAT FS"
+                if [ -x "/sbin/fatlabel" ]; then
+                    command="/sbin/fatlabel $mountpt $label"
+                    LogIt "Running $command"
+                    $command
+                else
+                    LogIt "No fatlabel command available to label a FAT/VFAT FS"
+                fi
             fi
         elif [ "$format" = "swap" ] ; then