Bug#387729: incomplete fix for #387729 in 0.97-17

[Pier Luigi Pau]

retitle 387729 grub-install fails due to flawed installation of scripts
found 387729 0.97-17
thanks

Please note: the retitling is due to the fact that the bug is
different in 0.97-17: grub-install still fails because of a flawed
installation of its wrapper, but this time, the real script is
installed (the old title was about the real script *missing* at all,
as it happened in 0.97-16).

Version 0.97-17, compared to -16.1, still has the wrapper installed to
/sbin only, but this time the real script is installed as
/usr/sbin/grub-install.real; the wrapper, however, checks for
existance of /usr/sbin/grub-install. As a result, running grub-install
now shows a complaint about /usr being broken, even when it's not.
Here are some relevant outputs:

# grub-install /dev/hda
Your /usr is broken; please fix it before calling this wrapper!
# /sbin/grub-install /dev/hda
Your /usr is broken; please fix it before calling this wrapper!
# /usr/sbin/grub-install /dev/hda
bash: /usr/sbin/grub-install: No such file or directory
# ls -l /usr/sbin |grep grub
-rwxr-xr-x 1 root root  136176 2006-10-02 16:50 grub
-rwxr-xr-x 1 root root    2987 2005-11-11 12:41 grub-floppy
-rwxr-xr-x 1 root root   15252 2006-10-02 16:50 grub-install.real
-rwxr-xr-x 1 root root    2312 2006-10-02 16:50 grub-md5-crypt
-rwxr-xr-x 1 root root    1213 2006-04-01 14:41 grub-reboot
-rwxr-xr-x 1 root root    2533 2006-10-02 16:50 grub-set-default
-rwxr-xr-x 1 root root    2473 2006-10-02 16:50 grub-terminfo
-rwxr-xr-x 1 root root     610 2006-10-02 16:50 update-grub
-rwxr-xr-x 1 root root   32102 2006-09-20 21:46 update-grub.real
# /usr/sbin/grub-install.real /dev/hda
Installation finished. No error reported.
This is the contents of the device map /boot/grub/device.map.
Check if this is correct or not. If any of the lines is incorrect,
fix it and re-run the script `grub-install'.

(hd0)   /dev/hda
#

In debian/rules, in fact, a line to install the wrapper to /usr/sbin is missing:

><<<
        # Add a wrapper for grub-install. Remove it post-etch
        mv debian/grub/usr/sbin/grub-install
debian/grub/usr/sbin/grub-install.real ; \
        cp debian/grub-install.wrapper debian/grub/sbin/grub-install

><<<

I understand that a wrapper in /usr/sbin is not wanted and this is why
my patch wasn't applied in the first place, but in this case, it won't
work if the real script is installed with the .real suffix.

Adding submitter for bug #387500, as well as Petter Reinholdtsen who
provided a fix, to Cc. This bug and #387500 were basically different
aspects of the same problem (failure of grub-install in d-i and on
grub updates), therefore #387500 is probably found again in -17 too.

Regards,
Pier Luigi Pau