Changeset 2158 in MondoRescue for branches/2.2.9/mindi

Timestamp:

Mar 5, 2009, 8:01:54 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fixes for ia64 support from Giuseppe Grassi <giuseppe.grassi2_at_italtel.it>:
  • the m) fake output is expected in fdisk.log so printing that on stdout instead of parted2fdisk log file
  • parted2fdisk supports now lack of partition given in 't' command
  • parted2fdisk supports now LVM type of partitions correctly (using a parted flag)
  • init links now /dev/tty to /dev/ttyS0 to have a working serial support on ia64

Location:

branches/2.2.9/mindi

Files:

• parted2fdisk.pl (modified) (7 diffs)
• rootfs/sbin/init (modified) (1 diff)

branches/2.2.9/mindi/parted2fdisk.pl

@@ -78 +78 @@
         "reiserfs" => "83",
         "linux-swap" => "82",
-        "LVM" => "8e",
+        "lvm" => "8e",
         "" => "",
     );
@@ -210 +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);
-                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                    print "command (m for help) send back to fake fdisk for mondorestore\n";
                 } elsif ($i =~ /^d$/) {
                     $part = <STDIN>;
@@ -221 +221 @@
                     system "$parted -s $device rm $part\n" if ($fake == 0);
                     get_parted($device,undef,\%start,\%end,undef);
-                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                    print "command (m for help) send back to fake fdisk for mondorestore\n";
                 } elsif ($i =~ /^w$/) {
                     print FLOG "w => quit\n";
@@ -231 +231 @@
                     }
                     chomp($part);
-                    $l = <STDIN>;
+                    # If no partition number given it's 1, and we received the type
+                    if ($part !~ /\d+/) {
+                        $l = $part;
+                        $part = 1 
+                    } else {
+                        $l = <STDIN>;
+                    }
                     if (not (defined $l)) {
                         print FLOG "no type given for tagging partition $part... skipping\n";
@@ -241 +247 @@
                         next;
                     }
-                    print FLOG "t $part $l => mkfs $part $pnum{$l}\n";
-                    system "$parted -s $device mkfs $part $pnum{$l}\n" if ($fake == 0);
-                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+
+                    if ($pnum{$l} eq "lvm") {
+                        # In that case this is a flag set, not a mkfs
+                        print FLOG "t $part $l => set $part $pnum{$l} on\n";
+                        system "$parted -s $device set $part $pnum{$l} on\n" if ($fake == 0);
+                    } else {
+                        print FLOG "t $part $l => mkfs $part $pnum{$l}\n";
+                        system "$parted -s $device mkfs $part $pnum{$l}\n" if ($fake == 0);
+                    }
+                    print "command (m for help) send back to fake fdisk for mondorestore\n";
                 } elsif ($i =~ /^a$/) {
                     $part = <STDIN>;
@@ -251 +264 @@
                     }
                     chomp($part);
+
+                    # Partition shouldn't be negative or null. Then take the first one.
+                    $part = 1 if ($part le 0);
+
                     print FLOG "a $part => set $part boot on\n";
                     system "$parted -s $device set $part boot on\n" if ($fake == 0);
-                    print FLOG "command (m for help) send back to fake fdisk for mondorestore\n";
+                    print "command (m for help) send back to fake fdisk for mondorestore\n";
                 } elsif ($i =~ /^q$/) {
                     print FLOG "q => quit\n";
@@ -338 +355 @@
         "reiserfs" => "Linux",
         "linux-swap" => "Linux swap",
-        "LVM" => "Linux LVM",
+        "lvm" => "Linux LVM",
         "fat16" => "fat16",
         "fat32" => "fat32",

branches/2.2.9/mindi/rootfs/sbin/init

@@ -81 +81 @@
     # May avoid shell error messages
     chmod 666 /dev/tty* /dev/console
+    if [ "$ARCH" = "ia64" ]; then
+        # Required to have a correct terminal or serial console support
+        ln -s -f /dev/ttyS0 /dev/tty
+    fi
 }