← Back to branch summary

~ubuntu-branches/ubuntu/maverick/grub/maverick-updates

« back to all changes in this revision

Viewing changes to debian/patches/prepend_virtio_devices.diff

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2011-09-23 22:36:41 UTC
  • Revision ID: package-import@ubuntu.com-20110923223641-78imsw8llmbde34m
Tags: 0.97-29ubuntu60.10.10.1
https://launchpad.net/bugs/720558
http://bugs.debian.org/456776
* Backport from Debian 0.97-39 (LP: #720558):
  - Support for Xen style xvd[a-z] devices.  Thanks Ian Campbell.
    (Closes: #456776)
* Don't use UUIDs for expressing xvd* devices as GRUB drives, as PV-GRUB
  can't handle it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/prepend_virtio_devices.diff
52
52
        )"
53
53
 
54
54
        # Convert RAID devices list into a list of disks
55
 
-       tmp_disks=`echo "$devices" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
56
 
+       tmp_disks=`echo "$devices" | sed -e 's%\([vsh]d[a-z]\)[0-9]*$%\1%' \
 
55
-       tmp_disks=`echo "$devices" | sed -e 's%\(\(s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
 
56
+       tmp_disks=`echo "$devices" | sed -e 's%\(\(v\|s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
57
57
                                         -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
58
58
                                         -e 's%\(fd[0-9]*\)$%\1%' \
59
59
                                         -e 's%/part[0-9]*$%/disc%' \
61
61
        case $1 in
62
62
                /dev/md*)  set -- `getraid_mdadm $1`
63
63
        esac
64
 
-       tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
65
 
+       tmp_disk=`echo "$1" | sed -e 's%\([vsh]d[a-z]\)[0-9]*$%\1%' \
 
64
-       tmp_disk=`echo "$1" | sed -e 's%\(\(s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
 
65
+       tmp_disk=`echo "$1" | sed -e 's%\(\(v\|s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
66
66
                                  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
67
67
                                  -e 's%\(fd[0-9]*\)$%\1%' \
68
68
                                  -e 's%/part[0-9]*$%/disc%' \
69
69
                                  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
70
70
                                  -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'`
71
 
-       tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
72
 
+       tmp_part=`echo "$1" | sed -e 's%.*/[vsh]d[a-z]\([0-9]*\)$%\1%' \
 
71
-       tmp_part=`echo "$1" | sed -e 's%.*/\(s\|h\|xv\)d[a-z]\([0-9]*\)$%\2%' \
 
72
+       tmp_part=`echo "$1" | sed -e 's%.*/\(v\|s\|h\|xv\)d[a-z]\([0-9]*\)$%\2%' \
73
73
                                  -e 's%.*d[0-9]*p%%' \
74
74
                                  -e 's%.*/fd[0-9]*$%%' \
75
75
                                  -e 's%.*/floppy/[0-9]*$%%' \