Patch for m68k boot-floppies

[Michael Schmitz <schmitz@tinocoq.cchem.berkeley.edu>]

Hi,

the following patch should be applied to the current boot-floppies source to
fix a bug in the Atari partition detection code, and add a new keymap on the
Macintoy. The diff is against the revisions of the 2.1.8 boot-floppies
source that were current at the time when I built the released m68k stuff
and should hopefully apply without major hassle. I send the patch to the
list rather than committing it directly mainly because I've not updated my
boot-floppies source since, and don't quite know how to make cvs commit a
patch that was made against a past revision to the current revision. 

With regard to the potato m68k boot-floppies: Chris Lawrence and David
Huggins-Daines have agreed to work on this (with focus on Amiga and Mac
install stuff but I'd expect the Atari and VME parts will build without
major hassle once the potato source works for m68k in general). I'll be
available to help get them started in case that's necessary. 

WRT the requirement for lha in boot-floppies and slink-cd: the Amiga and
Atari install files are now packaged in tar format in addition to the lha
archive. slink-cd should have no trouble using these files, the lha format
files are provided for the convenience of the users alone. I hope that
solves the problem. 

	Michael


Index: utilities/libfdisk/partbl_atari.c
===================================================================
RCS file: /debian/home/sr1/lib/cvs/./boot-floppies/utilities/libfdisk/partbl_atari.c,v
retrieving revision 1.3
diff -u -r1.3 partbl_atari.c
--- partbl_atari.c	1998/02/24 10:32:59	1.3
+++ partbl_atari.c	1999/05/26 22:43:54
@@ -68,7 +68,9 @@
     rs = (struct rootsector *) data;
     if (!(fdisk_device = fdisk_find_disk( device )))
 	return 0;
-    hd_size = fdisk_device->size;
+	/* fdisk_device->size is in kByte, but we need it in sectors for
+	 * comparisons. */
+    hd_size = 2*fdisk_device->size+1;
 
     if (!VALID_PARTITION( &rs->part[0], hd_size ) &&
 	!VALID_PARTITION( &rs->part[1], hd_size ) &&
Index: utilities/dinstall/kbdconfig.c
===================================================================
RCS file: /debian/home/sr1/lib/cvs/./boot-floppies/utilities/dinstall/Attic/kbdconfig.c,v
retrieving revision 1.20
diff -u -r1.20 kbdconfig.c
--- kbdconfig.c	1999/03/12 05:23:38	1.20
+++ kbdconfig.c	1999/05/26 22:44:39
@@ -23,15 +23,16 @@
     { "atari-us",        "U.S. English (Atari)"      , 1},
     { "atari-de",        "Germany (Atari)"           , 0},
     { "atari-se",        "Sweden (Atari)"            , 0},
-    { "atari-uk", 	 "English (Atari Falcon)"    , 0},
+    { "atari-uk", 	 "English (Atari Falcon)"    , 0}
   };
   int nchoices_ata=4;
   struct d_choices keymaps_mac[]={
     { "mac-us-std",      "U.S. English (Mac, 82 keys)"     , 1},
     { "mac-us-ext",      "U.S. English (Mac, extended kbd)", 0},
-    { "mac-fr2-ext",     "France (Mac, extended kbd)"      , 0}
+    { "mac-fr2-ext",     "France (Mac, extended kbd)"      , 0},
+    { "mac-de-ext",      "Germany (Mac, extended kbd)"     , 0}
   };
-  int nchoices_mac=3;
+  int nchoices_mac=4;
   int nchoices;
 #elif #cpu (sparc)
   struct d_choices keymaps[]={