diff options
| author | root <root@arianrhod.panaceas.james.local> | 2012-11-16 11:52:02 +0000 |
|---|---|---|
| committer | root <root@arianrhod.panaceas.james.local> | 2012-11-16 11:52:02 +0000 |
| commit | a109bb6d0eb936ac4e2a9f0ee46a269a58ec48ce (patch) | |
| tree | 9a6b9c35465b23ce5871feec5e9ba0c7d5ac7797 /master/debian/mkconfig_skip_dmcrypt.patch | |
| download | grub-1.99-pq-a109bb6d0eb936ac4e2a9f0ee46a269a58ec48ce.tar.gz grub-1.99-pq-a109bb6d0eb936ac4e2a9f0ee46a269a58ec48ce.tar.bz2 grub-1.99-pq-a109bb6d0eb936ac4e2a9f0ee46a269a58ec48ce.zip | |
fish
Diffstat (limited to 'master/debian/mkconfig_skip_dmcrypt.patch')
| -rw-r--r-- | master/debian/mkconfig_skip_dmcrypt.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/master/debian/mkconfig_skip_dmcrypt.patch b/master/debian/mkconfig_skip_dmcrypt.patch new file mode 100644 index 0000000..4e74652 --- /dev/null +++ b/master/debian/mkconfig_skip_dmcrypt.patch @@ -0,0 +1,30 @@ +Description: Warn and return without error if /boot is a dm-crypt device + With any luck the administrator knows what they're doing; in any event, we + probably can't improve matters by having update-grub exit non-zero. +Author: Marc Haber <mh+debian-bugs@zugschlus.de> +Author: Colin Watson <cjwatson@debian.org> +Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542165#25 +Bug-Debian: http://bugs.debian.org/542165 +Forwarded: no +Last-Update: 2010-06-05 + +Index: b/util/grub-mkconfig_lib.in +=================================================================== +--- a/util/grub-mkconfig_lib.in ++++ b/util/grub-mkconfig_lib.in +@@ -105,6 +105,15 @@ + { + device="$1" + ++ if dmsetup status $device 2>/dev/null | grep -q 'crypt[[:space:]]$'; then ++ grub_warn \ ++ "$device is a crypto device, which GRUB cannot read directly. Some" \ ++ "necessary modules may be missing from /boot/grub/grub.cfg. You may" \ ++ "need to list them in GRUB_PRELOAD_MODULES in /etc/default/grub. See" \ ++ "http://bugs.debian.org/542165 for details." ++ return 0 ++ fi ++ + # Abstraction modules aren't auto-loaded. + abstraction="`"${grub_probe}" --device "${device}" --target=abstraction`" + for module in ${abstraction} ; do |