Bug#80325: Installer misreports partition numbers

[Glenn McGrath <bug1@optushome.com.au>]

Just to create more email traffic, heres a better diff

diff -r -d -U 3 ./boot-floppies.orig/utilities/libfdisk/partbl_msdos.c ./boot-floppies/utilities/libfdisk/partbl_msdos.c
--- ./boot-floppies.orig/utilities/libfdisk/partbl_msdos.c	Sat May  6 01:44:26 2000
+++ ./boot-floppies/utilities/libfdisk/partbl_msdos.c	Wed Jan 10 19:33:43 2001
@@ -322,21 +322,27 @@
 	if (is_extended_partition(p)) {
 	    extended_partition(device, fd, START_SECT(p), NR_SECTS(p));
 	}
+    }
 #if HAVE_BSD_DISKLABEL
+    p = (struct partition *) (0x1be + data);
+    for (i=1 ; i<=4 ; minor++,i++,p++) {
 	if (SYS_IND(p) == BSD_PARTITION) {
 	    bsd_disklabel_partition(device, fd, START_SECT(p));
 	}
+    }
 #endif
 #if HAVE_SOLARIS_X86_PARTITION
-	/* james@bpgc.com: Solaris has a nasty indicator: 0x82
-	 * which also means linux swap.  For that reason, all
-	 * of the prints are done inside the
-	 * solaris_x86_partition routine */
+    /* james@bpgc.com: Solaris has a nasty indicator: 0x82
+     * which also means linux swap.  For that reason, all
+     * of the prints are done inside the
+     * solaris_x86_partition routine */
+    p = (struct partition *) (0x1be + data);
+    for (i=1 ; i<=4 ; minor++,i++,p++) {
 	if (SYS_IND(p) == SOLARIS_X86_PARTITION) {
 	    solaris_x86_partition(device, fd, START_SECT(p));
 	}
-#endif
     }
+#endif
     /*
      *  Check for old-style Disk Manager partition table
      */