← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/kfreebsd_ext2.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/kfreebsd_ext2.patch
1
 
Description: Add support for ext2 root on GNU/kFreeBSD
2
 
Author: Aurelien Jarno <aurel32@debian.org>
3
 
Bug-Debian: http://bugs.debian.org/593467
4
 
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2010-08/msg00038.html
5
 
Last-Update: 2010-08-19
6
 
 
7
 
Index: b/util/grub.d/10_kfreebsd.in
8
 
===================================================================
9
 
--- a/util/grub.d/10_kfreebsd.in
10
 
+++ b/util/grub.d/10_kfreebsd.in
11
 
@@ -75,6 +75,14 @@
12
 
   fi
13
 
 
14
 
   case "${kfreebsd_fs}" in
15
 
+    ext2fs)
16
 
+      test -e "${module_dir}/ext2fs.ko"
17
 
+
18
 
+      printf '%s\n' "${prepare_module_dir_cache}"
19
 
+      cat << EOF
20
 
+       kfreebsd_module_elf     ${module_dir_rel}/ext2fs.ko
21
 
+EOF
22
 
+    ;;
23
 
     zfs)
24
 
       test -e "${module_dir}/opensolaris.ko"
25
 
       test -e "${module_dir}/zfs.ko"
26
 
@@ -121,6 +129,7 @@
27
 
 
28
 
   case ${GRUB_FS} in
29
 
     ufs1 | ufs2)        kfreebsd_fs=ufs ;;
30
 
+    ext2)               kfreebsd_fs=ext2fs ;;
31
 
     *)                  kfreebsd_fs=${GRUB_FS} ;;
32
 
   esac
33