← Back to branch summary

~ubuntu-branches/ubuntu/lucid/grub/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/grub-install_xvd.diff

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2011-09-23 21:58:06 UTC
  • Revision ID: package-import@ubuntu.com-20110923215806-12w2cbwvbb7abfmz
Tags: 0.97-29ubuntu60.10.04.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/grub-install_xvd.diff
 
1
--- a/util/grub-install.in      2011-09-23 16:45:36.000000000 +0100
 
2
+++ b/util/grub-install.in      2011-09-23 16:46:46.000000000 +0100
 
3
@@ -104,7 +104,7 @@
 
4
        )"
 
5
 
 
6
        # Convert RAID devices list into a list of disks
 
7
-       tmp_disks=`echo "$devices" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
 
8
+       tmp_disks=`echo "$devices" | sed -e 's%\(\(s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
 
9
                                         -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 
10
                                         -e 's%\(fd[0-9]*\)$%\1%' \
 
11
                                         -e 's%/part[0-9]*$%/disc%' \
 
12
@@ -144,13 +144,13 @@
 
13
        case $1 in
 
14
                /dev/md*)  set -- `getraid_mdadm $1`
 
15
        esac
 
16
-       tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
 
17
+       tmp_disk=`echo "$1" | sed -e 's%\(\(s\|h\|xv\)d[a-z]\)[0-9]*$%\1%' \
 
18
                                  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 
19
                                  -e 's%\(fd[0-9]*\)$%\1%' \
 
20
                                  -e 's%/part[0-9]*$%/disc%' \
 
21
                                  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
 
22
                                  -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'`
 
23
-       tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 
24
+       tmp_part=`echo "$1" | sed -e 's%.*/\(s\|h\|xv\)d[a-z]\([0-9]*\)$%\2%' \
 
25
                                  -e 's%.*d[0-9]*p%%' \
 
26
                                  -e 's%.*/fd[0-9]*$%%' \
 
27
                                  -e 's%.*/floppy/[0-9]*$%%' \