At 16:08 -0500 2000-02-09, Daniel Jacobowitz wrote:
>There's a new ppc boot floppies in incoming if anyone wants to try
>them. I really doubt they can be worse than what we have in the
>archive now.
The arch check is still broken. The first diff fixes that. The second diff
uses the `fdisk' wrapper instead of `cfdisk' on pmacs.
Index: main.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main.c,v
retrieving revision 1.60
diff -u -r1.60 main.c
--- main.c 2000/02/06 23:13:04 1.60
+++ main.c 2000/02/09 22:18:05
@@ -398,9 +398,10 @@
#if #cpu (powerpc)
Arch2=get_powerpc_model();
- if ( (strcmp(Arch2,"CHRP")) && (strcasecmp(Arch2,"Power")) &&
- (strcasecmp(Arch2,"Powerbook")) && (strcasecmp(Arch2,"iMac")) &&
- (strcmp(Arch2,"PReP"))) {
+ if ((strncasecmp(Arch2, "Power", 5) == 0)
+ || (strncasecmp(Arch2, "iMac", 4) == 0)) Arch2 = "PowerMac";
+ else
+ if ( (strcmp(Arch2,"CHRP")) && (strcmp(Arch2,"PReP"))) {
problemBox(_("Your PowerPC architecture is not supported yet."),
_("Problem"));
reboot(RB_AUTOBOOT);
}
Index: partition_config.c
===================================================================
RCS file:
/cvs/debian-boot/boot-floppies/utilities/dbootstrap/partition_config.c,v
retrieving revision 1.23
diff -u -r1.23 partition_config.c
--- partition_config.c 2000/02/01 08:53:55 1.23
+++ partition_config.c 2000/02/09 22:18:05
@@ -126,7 +126,8 @@
}
free (swaps);
}
- if ( NAME_ISEXE( "/sbin/cfdisk", &statbuf ) ) {
+ if ( NAME_ISEXE( "/sbin/cfdisk", &statbuf ) &&
+ ( strcmp(Arch2, "PowerMac") != 0 ) ) {
sprintf(prtbuf,"cfdisk %s",d->name);
boxSuspend();
status=system(prtbuf);
In case you're wondering, yes, I did test these, and yes, they do work. The
kernel image works fine on my smurf tower, though I'm unsure if USB is OK,
since I don't use that.
I used yaboot to boot it.
I have a ramdisk.image.gz with these fixes at
<http://web.espy.org/ftp/debian/ramdisk.image.gz>.
--
Joel Klecker (aka Espy) Debian GNU/Linux Developer
<URL:mailto:[EMAIL PROTECTED]> <URL:mailto:[EMAIL PROTECTED]>
<URL:http://web.espy.org/> <URL:http://www.debian.org/>
