Changeset 2154 in MondoRescue

Timestamp:

Feb 19, 2009, 12:03:57 AM (16 years ago)

Author:

Bruno Cornec

Message:

• for ia64 parted2fdisk should fake in the log the return line of normal fdisk looking like "command (m ..." for n, d and t orders (reported by Grassi Giuseppe giuseppe.grassi2_at_italtel.it)

Location:

branches/2.2.9

Files:

• mindi/parted2fdisk.pl (modified) (5 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.9/mindi/parted2fdisk.pl

@@ -142 +142 @@
                 if ($i =~ /^p$/) {
                     fdisk_list($device,undef,\%start,\%end, 1);
-                }
-                elsif ($i =~ /^n$/) {
+                } elsif ($i =~ /^n$/) {
                     fdisk_list($device,undef,\%start,\%end, 0);
                     if ($type ne "gpt") {
@@ -211 +210 @@
                     print FLOG "n $l $part $cylstart $cylend => mkpart primary $start $end\n";
                     system "$parted -s $device mkpart primary ext2 $start $end\n" if ($fake == 0);
-                }
-                elsif ($i =~ /^d$/) {
+                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                } elsif ($i =~ /^d$/) {
                     $part = <STDIN>;
                     if (not (defined $part)) {
@@ -222 +221 @@
                     system "$parted -s $device rm $part\n" if ($fake == 0);
                     get_parted($device,undef,\%start,\%end,undef);
-                }
-                elsif ($i =~ /^w$/) {
+                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                } elsif ($i =~ /^w$/) {
                     print FLOG "w => quit\n";
-                }
-                elsif ($i =~ /^t$/) {
+                } elsif ($i =~ /^t$/) {
                     $part = <STDIN>;
                     if (not (defined $part)) {
@@ -245 +243 @@
                     print FLOG "t $part $l => mkfs $part $pnum{$l}\n";
                     system "$parted -s $device mkfs $part $pnum{$l}\n" if ($fake == 0);
-                }
-                elsif ($i =~ /^a$/) {
+                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                } elsif ($i =~ /^a$/) {
                     $part = <STDIN>;
                     if (not (defined $part)) {
@@ -255 +253 @@
                     print FLOG "a $part => set $part boot on\n";
                     system "$parted -s $device set $part boot on\n" if ($fake == 0);
-                }
-                elsif ($i =~ /^q$/) {
+                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                } elsif ($i =~ /^q$/) {
                     print FLOG "q => quit\n";
-                }
-                else {
+                } else {
                     print FLOG "Unknown command: $i\n";
                     next;

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -1784 +1784 @@
             MONDO_LOGFILE);
 
-    /* BERLIOS: shoould not be called each time */
+    /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
     output[0] = '\0';