Re: kbd-chooser for DECstation machines

[Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>]

Martin Schulze wrote:
[snip]
> > We could simply declare no preferred keyboard for the mipsel
> > architecture (beware, there's __mips__ for both mips and mipsel, and
> > __MIPSEL__ for only mipsel).  This would require the dialog to be
> > displayed, though, for the user to be able to select the keyboard
> > type.  Since it is of medium priority and only high priority dialogs
> > are displayed, this may not be sufficient.
> 
> Changing this for DECstation machines should fixed with the attached patch.
> 
> Regards,
> 
> 	Joey
> 
> -- 
> This is GNU/Linux Country.  On a quiet night, you can hear Windows reboot.
> 
> Please always Cc to me when replying to me on the lists.

Content-Description: Change kbd default type on DECstation boxes
> --- orig/kbd-chooser-1.02/dec-kbd.c	2004-04-01 23:42:22.000000000 +0200
> +++ kbd-chooser-1.02/dec-kbd.c	2004-09-30 21:26:04.000000000 +0200
> @@ -28,5 +28,14 @@ kbd_t *dec_kbd_get (kbd_t *keyboards, co
>  	k->next = keyboards;
>  	keyboards = k;
>  	
> +#if defined(__mipsel___)

Does this really work? __mipsel__ is not a predefined gcc macro, neither
with two nor with three trailing underscores (__MIPSEL__ would be).

> +	// /proc must be mounted by this point
> +	// assert (check_dir ("/proc") == 1);
> +
> +	if (check_dir ("/proc")) {
> +		if ((grep ("/proc/cpuinfo","DECstation ") == 0))

This doesn't match "DECsystem" and a host of other machines detected by
archdetect. It's probably better to (re-)use the archdetect values
like "mipsel/r4k-kn04" instead. Archdetect is always available in the
d-i initrd.


Thiemo