3 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2430b977f..353b054b1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -386,7 +386,7 @@ sub createBootdisk {
 #------------------------------------------------------------------------------
 sub setupBootloader {
     $o->setupBootloaderBefore if $_[1] == 1;
-    $o->setupBootloader($_[1] > 1);
+    $o->setupBootloader($_[1] - 1);
 }
 #------------------------------------------------------------------------------
 sub configureX {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 37284e52a..0282b6269 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -599,7 +599,7 @@ sub setupBootloader {
     my ($o, $more) = @_;
     my $b = $o->{bootloader};
 
-    if ($::beginner && !$more) {
+    if ($::beginner && $more == 1) {
 	my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition"));
 
 	my $boot = $o->{hds}[0]{device};
@@ -608,7 +608,7 @@ sub setupBootloader {
 	  $o->ask_from_list_(_("LILO Installation"),
 			     _("Where do you want to install the bootloader?"),
 			     \@l, $l[!$onmbr]) eq $l[0];
-    } else {
+    } elsif ($more || !$::beginner) {
 	$::expert and $o->ask_yesorno('', _("Do you want to use LILO?"), 1) || return;
     
 	my @l = (
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 6a098af5a..dc2715745 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -17,7 +17,13 @@ my $offset = $common::SECTORSIZE - length($magic) - $nb_primary * common::psizeo
 my @MBR_signatures = (
     [ 'empty', 0, "\0\0\0\0" ],
     [ 'lilo', 0x6,  "LILO" ],
-    [ 'dos',  0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
+    [ 'osbs', 0x2,  "OSBS" ], #- http://www.prz.tu-berlin.de/~wolf/os-bs.html
+    [ 'pqmagic', 0xef, "PQV" ],      
+    [ 'DocsBoot', 0x148, 'DocsBoot' ],
+    [ 'system_commander', 0x1ad, "SYSCMNDRSYS" ],
+    [ 'dos', 0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
+    [ 'dos', 0x60, "\xBB\x00\x7C\xB8\x01\x02\x57\xCD\x13\x5F\x73\x0C\x33\xC0\xCD\x13" ], #- nt's
+    [ 'ranish', 0x100, "\x6A\x10\xB4\x42\x8B\xF4\xCD\x13\x8B\xE5\x73" ],
 );
 
 sub typeOfMBR($) { typeFromMagic(devices::make($_[0]), @MBR_signatures) }