Changeset 3344 in MondoRescue for branches

Timestamp:

Feb 13, 2015, 8:39:50 PM (9 years ago)

Author:

Bruno Cornec

Message:

• parted2fdisk now calls fdisk with the parameters when not using the embedded code. Ready to be the only call in mondo now

File:

• branches/3.2/mindi/parted2fdisk.pl (modified) (2 diffs)

branches/3.2/mindi/parted2fdisk.pl

@@ -197 +197 @@
 close(CMD);
 chomp($version);
-$version =~ s/[^0-9\.]*([0-9\.]+)[\)]$/$1/;
+$version =~ s/[^0-9\.]*([0-9\.]+)[\)]*$/$1/;
 my ($v,$maj,$min) = split(/\./,$version);
 
@@ -370 +370 @@
 #
 # Print only mode
-print FLOG "Passing everything to the real fdisk\n";
-my $fargs = join(@ARGV);
+print FLOG "Passing everything to the real fdisk with $args $device\n";
 
 if ($args =~ /^-/) {
     # -l or -s
-    open (FDISK, "$fdisk $fargs 2>/dev/null |") || die "Unable to read from $fdisk";
+    open (FDISK, "$fdisk $args $device 2>/dev/null |") || die "Unable to read from $fdisk";
     while (<FDISK>) {
-        print;
+        print $_;
     }
     close(FDISK);
 } else {
     # Modification mode
-    open (FDISK, "| $fdisk $fargs 2>/dev/null") || die "Unable to modify through $fdisk";
+    open (FDISK, "| $fdisk $args $device 2>/dev/null") || die "Unable to modify through $fdisk";
     while (<STDIN>) {
-        print FDISK;
+        print FDISK $_;
     }
     close(FDISK);