Bug#477998: /usr/sbin/update-grub: update-grub fails with /dev/md/0

[Stephen Kitt]

Package: grub
Version: 0.97-36
Severity: important
File: /usr/sbin/update-grub
Tags: patch


Hi,

For some reason mount on my system reports / as /dev/md/0, and
update-grub fails to determine the type of RAID device as a result. The
attached patch fixes this.

Regards,

Stephen

-- Package-specific info:

*********************** BEGIN /proc/mounts
/dev/md0 / ext2 rw,relatime,errors=remount-ro 0 0
/dev/md0 /dev/.static/dev ext2 rw,errors=remount-ro 0 0
/dev/mapper/vg--span-usr /usr ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--span-usrvar /usr/var ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--span-usrlocal /usr/local ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--mirror-home /home ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--spare-backup /usr/var/backups/bacula ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--stripe-srv /srv ext3 rw,relatime,data=ordered 0 0
*********************** END /proc/mounts

*********************** BEGIN /proc/mounts
rootfs / rootfs rw 0 0
none /sys sysfs rw,nosuid,nodev,noexec 0 0
none /proc proc rw,nosuid,nodev,noexec 0 0
udev /dev tmpfs rw 0 0
/dev/md0 / ext2 rw,relatime,errors=remount-ro 0 0
/dev/md0 /dev/.static/dev ext2 rw,errors=remount-ro 0 0
tmpfs /lib/init/rw tmpfs rw,nosuid 0 0
tmpfs /dev/shm tmpfs rw,nosuid,nodev 0 0
devpts /dev/pts devpts rw,nosuid,noexec 0 0
tmpfs /tmp tmpfs rw 0 0
/dev/mapper/vg--span-usr /usr ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--span-usrvar /usr/var ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--span-usrlocal /usr/local ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--mirror-home /home ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--spare-backup /usr/var/backups/bacula ext3 rw,relatime,data=ordered 0 0
/dev/mapper/vg--stripe-srv /srv ext3 rw,relatime,data=ordered 0 0
automount(pid6819) /amnt autofs rw,fd=4,pgrp=6819,timeout=300,minproto=2,maxproto=4,indirect 0 0
binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec 0 0
*********************** END /proc/mounts

*********************** BEGIN /proc/mounts

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (300, 'stable'), (200, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages grub depends on:
ii  grub-common              1.96+20080413-1 GRand Unified Bootloader, version 
ii  libc6                    2.7-10          GNU C Library: Shared libraries
ii  libncurses5              5.6+20080308-1  Shared libraries for terminal hand

grub recommends no packages.

-- no debconf information
-------------- next part --------------
diff -ur grub-0.97.orig/debian/update-grub grub-0.97/debian/update-grub
--- grub-0.97.orig/debian/update-grub	2008-04-26 10:57:53.000000000 +0200
+++ grub-0.97/debian/update-grub	2008-04-26 10:58:51.000000000 +0200
@@ -77,7 +77,7 @@
 convert_raid1 ()
 {
     case $1 in
-        /dev/md[0-9])
+        /dev/md[0-9] | /dev/md/[0-9])
             : ;; # Continue
         *)
             return 1 ;;