On Sun, Feb 03, 2008 at 02:51:08PM +0100, Frans Pop wrote: > On Sunday 03 February 2008, Robert Millan wrote: > > I'm not familiar with this part; could it be that we just need to adjust > > XB-Installer-Menu-Item in yaboot-installer ? > > From installer/doc/devel/menu-item-numbers.txt: > 7000 apt-setup > pkgsel > 7300 palo-installer (hppa) > grub-installer (i386) > yaboot-installer (powerpc/powermac_newworld, powerpc/chrp*) > quik-installer (powerpc/powermac_oldworld) > zipl-installer (s390) > arcboot-installer (mips) > delo-installer (mipsel) > silo-installer (sparc) > vmelilo-installer (m68k/vme*) > glantank-installer (arm/iop32x) > 7500 lilo-installer (i386) > 7600 elilo-installer (ia64, i386) > 7700 nobootloader (all) > > Looking at that there are two options: > - change grub-installer from 7300 to 7400 > - change yaboot-installer from 7300 to 7200 > Both will work, but not sure which is to be preferred. I guess the first > option is most straightforward.
I agree, this seems better as it'll also handle similar situations in the future (GRUB is extending arch support quickly ;-)). > And that would still leave powerpc/powermac_oldworld. AFAICT grub should not > be installable for that. Which also reminds me that you did not really > address this question: > > Also, if only some subarchitectures are supported, grub-installer should > > at least check for those (but I'm not sure that you can check for just > > pegasos/efika). > > Preferably, grub should not be offered for _any_ powerpc systems it does not > support. Looking at libdebian-installer/src/system/subarch-powerpc-linux.c, > the only subarch where grub should be installable is powerpc/chrp_pegasos, > so it looks like this could easily be solved in grub's debian/isinstallable > file. Ok. > Please post patches (including changelog entry) to the list before > committing. Here's a patch based on your advice. Unfortunately I can't test it, because my Efika died. Hopefully someone else can. Anyway, if this becomes a problem we can just remove "powerpc" from arch list untill someone with working hardware is willing to maintain it. I'm sorry that I can't (the PSU didn't like Europe). -- Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call… if you are unable to speak? (as seen on /.)
Index: installer/doc/devel/menu-item-numbers.txt =================================================================== --- installer/doc/devel/menu-item-numbers.txt (revision 51170) +++ installer/doc/devel/menu-item-numbers.txt (working copy) @@ -59,7 +59,6 @@ 7000 apt-setup pkgsel 7300 palo-installer (hppa) - grub-installer (i386) yaboot-installer (powerpc/powermac_newworld, powerpc/chrp*) quik-installer (powerpc/powermac_oldworld) zipl-installer (s390) @@ -68,6 +67,7 @@ silo-installer (sparc) vmelilo-installer (m68k/vme*) glantank-installer (arm/iop32x) +7400 grub-installer (i386, powerpc/chrp_pegasos) 7500 lilo-installer (i386) 7600 elilo-installer (ia64, i386) 7700 nobootloader (all) Index: packages/arch/i386/grub-installer/debian/control =================================================================== --- packages/arch/i386/grub-installer/debian/control (revision 51170) +++ packages/arch/i386/grub-installer/debian/control (working copy) @@ -10,6 +10,6 @@ Architecture: i386 hurd-i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc Provides: bootable-system Depends: cdebconf-udeb, kernel-installer, created-fstab, di-utils (>= 1.15), di-utils-mapdevfs, os-prober, partman-utils -XB-Installer-Menu-Item: 7300 +XB-Installer-Menu-Item: 7400 XC-Package-Type: udeb Description: Install GRUB on a hard disk Index: packages/arch/i386/grub-installer/debian/isinstallable =================================================================== --- packages/arch/i386/grub-installer/debian/isinstallable (revision 51170) +++ packages/arch/i386/grub-installer/debian/isinstallable (working copy) @@ -34,6 +34,12 @@ exit 1 fi ;; + powerpc/chrp_pegasos) + ;; + powerpc/*) + log "GRUB not yet installable on PowerPC-based platforms other than Pegasos/Efika" + exit 1 + ;; esac bootfs=$(findfs /boot)