-
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
* 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.