Changeset 3550 in MondoRescue for branches

Timestamp:

Apr 4, 2016, 4:49:46 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Really fix #778 by taking in acount the FAT size !

File:

• branches/3.2/MondoRescue/bin/mr-label (modified) (1 diff)

branches/3.2/MondoRescue/bin/mr-label

@@ -121 +121 @@
 my($inputfh, $buffer, $offset, $length, $hexlabel);
 
+# Evaluate the size of the FAT with blkid -p
+open(FS,"blkid -p $inputf|") || die "$0: cannot blkid -p $inputf: $!";
+my $verfs = <FS>;
+close(FS);
+$verfs =~ s/.*VERSION="FAT([0-9][0-9]).*"/FAT$1/;
+chomp($verfs);
+pb_log(1,"Working on a FS ot type ***$verfs***\n");
+
 open($inputfh,  "+< $inputf") || die "$0: cannot open $inputf for reading/writing: $!";
 binmode($inputfh) || die "binmode failed: $!";
 
+# Source https://www.win.tue.nl/~aeb/linux/fs/fat/fat-1.html
 if (defined $label) {
-    # 42 first bytes are untouched
-    $offset = 43;
+    # x first bytes are untouched
+    $offset = 43 if (($verfs =~ /FAT16/) || ($verfs =~ /FAT12/));
+    $offset = 71 if ($verfs =~ /FAT32/);
     $length = 11;
 } elsif (defined $uuid) {
-    # 38 first bytes are untouched
-    $offset = 39;
+    # x first bytes are untouched
+    $offset = 39 if (($verfs =~ /FAT16/) || ($verfs =~ /FAT12/));
+    $offset = 67 if ($verfs =~ /FAT32/);
     $length = 4;
 } else {