← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/disable_floppies.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-02-08 11:39:26 UTC
  • mfrom: (17.6.26 experimental)
  • mto: (17.6.27 experimental)
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: james.westby@ubuntu.com-20110208113926-clfs90haboyk9zip
Tags: 1.99~rc1-2
https://launchpad.net/bugs/712029
https://launchpad.net/bugs/712029
* Merge 1.98+20100804-13 and 1.98+20100804-14, updating translations:
  - Kazakh (Baurzhan Muftakhidinov / Timur Birsh).
* mkconfig_skip_dmcrypt.patch: Refer to GRUB_PRELOAD_MODULES rather than
  suggesting people write a /etc/grub.d/01_modules script (thanks, Jordan
  Uggla).
* Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes
  grub-mkrelpath on btrfs subvolumes (LP: #712029).
* Add rootflags=subvol=<name> if / is on a btrfs subvolume (LP: #712029).
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable_floppies.patch
3
3
 
4
4
An ugly kludge.  Should this be merged upstream?
5
5
 
6
 
Index: b/kern/emu/hostdisk.c
 
6
Index: b/grub-core/kern/emu/hostdisk.c
7
7
===================================================================
8
 
--- a/kern/emu/hostdisk.c
9
 
+++ b/kern/emu/hostdisk.c
10
 
@@ -953,6 +953,18 @@
 
8
--- a/grub-core/kern/emu/hostdisk.c
 
9
+++ b/grub-core/kern/emu/hostdisk.c
 
10
@@ -963,6 +963,18 @@
11
11
          continue;
12
12
        }
13
13