← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/mkconfig_skip_dmcrypt.patch

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-01-16 15:18:04 UTC
  • mfrom: (17.6.38 experimental)
  • Revision ID: package-import@ubuntu.com-20140116151804-3foouk7fpqcq3sxx
Tags: 2.02~beta2-2
* Convert patch handling to git-dpm.
* Add bi-endian support to ELF parser (Tomohiro B Berry).
* Adjust restore_mkdevicemap.patch to mark get_kfreebsd_version as static,
  to appease "gcc -Werror=missing-prototypes".
* Cherry-pick from upstream:
  - Change grub-macbless' manual page section to 8.
* Install grub-glue-efi, grub-macbless, grub-render-label, and
  grub-syslinux2cfg.
* grub-shell: Pass -no-pad to xorriso when building floppy images.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/mkconfig_skip_dmcrypt.patch
1
 
Description: Warn and return without error if /boot is a dm-crypt device
2
 
 With any luck the administrator knows what they're doing; in any event, we
3
 
 probably can't improve matters by having update-grub exit non-zero.
4
 
Author: Marc Haber <mh+debian-bugs@zugschlus.de>
5
 
Author: Colin Watson <cjwatson@debian.org>
6
 
Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542165#25
7
 
Bug-Debian: http://bugs.debian.org/542165
8
 
Forwarded: no
9
 
Last-Update: 2010-06-05
10
 
 
11
 
Index: b/util/grub-mkconfig_lib.in
12
 
===================================================================
13
 
--- a/util/grub-mkconfig_lib.in
14
 
+++ b/util/grub-mkconfig_lib.in
15
 
@@ -129,6 +129,15 @@
16
 
     esac
17
 
   done
18
 
 
19
 
+  if dmsetup status $device 2>/dev/null | grep -q 'crypt[[:space:]]$'; then
20
 
+    grub_warn \
21
 
+      "$device is a crypto device, which GRUB cannot read directly.  Some" \
22
 
+      "necessary modules may be missing from /boot/grub/grub.cfg.  You may" \
23
 
+      "need to list them in GRUB_PRELOAD_MODULES in /etc/default/grub.  See" \
24
 
+      "http://bugs.debian.org/542165 for details."
25
 
+    return 0
26
 
+  fi
27
 
+
28
 
   # Abstraction modules aren't auto-loaded.
29
 
   abstraction="`"${grub_probe}" --device "${device}" --target=abstraction`"
30
 
   for module in ${abstraction} ; do