← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/mkrescue_diet.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/mkrescue_diet.patch
26
26
 
27
27
 $self generates a bootable rescue image with specified source files, source
28
28
 directories, or mkisofs options listed by: xorriso -as mkisofs -help
29
 
@@ -132,6 +134,9 @@
 
29
@@ -133,6 +135,9 @@
30
30
     --xorriso=*)
31
31
         xorriso=`echo "${option}/" | sed 's/--xorriso=//'` ;;
32
32
 
36
36
     *)
37
37
        source="${source} ${option} $@"; break ;;
38
38
     esac
39
 
@@ -310,7 +315,14 @@
 
39
@@ -303,7 +308,14 @@
40
40
 fi
41
41
 
42
42
 # build iso image