← Back to branch summary

~ubuntu-branches/debian/jessie/grub/jessie

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-03-17 13:34:14 UTC
  • Revision ID: james.westby@ubuntu.com-20110317133414-cawa48d482iuqqb9
Tags: 0.97-65
http://bugs.debian.org/570318
* Fix grub/migrate_from_legacy title to not end with a full stop.
* Fix update-grub(8) groff typo (".bar" instead of ".br").
* Adjust doc-base file to account for renaming of grub.info to
  grub-legacy.info.
* Compare -trunk kernels earlier than numeric ABIs (thanks, Aaron M. Ucko
  and Andreas Beckmann; closes: #570318).
* Convert from home-grown patch system to quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/grub-install_aoe_support.diff
1
 
diff -Nur grub-0.97-orig/util/grub-install.in grub-0.97/util/grub-install.in
2
 
--- grub-0.97-orig/util/grub-install.in 2006-07-10 17:39:19.000000000 -0300
3
 
+++ grub-0.97/util/grub-install.in      2006-07-10 17:28:51.000000000 -0300
4
 
@@ -148,13 +148,16 @@
5
 
                                  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
6
 
                                  -e 's%\(fd[0-9]*\)$%\1%' \
7
 
                                  -e 's%/part[0-9]*$%/disc%' \
8
 
-                                 -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
9
 
+                                 -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
10
 
+                                 -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'`
11
 
        tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
12
 
                                  -e 's%.*d[0-9]*p%%' \
13
 
                                  -e 's%.*/fd[0-9]*$%%' \
14
 
                                  -e 's%.*/floppy/[0-9]*$%%' \
15
 
                                  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
16
 
-                                 -e 's%.*c[0-7]d[0-9]*p%%'`
17
 
+                                 -e 's%.*c[0-7]d[0-9]*p*%%' \
18
 
+                                 -e 's%.*e[0-9]\.[0-9]*p%%' \
19
 
+                                 -e 's%.*e[0-9]\.[0-9]*\$%%'`
20
 
        ;;
21
 
     gnu*)
22
 
        tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`