diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-02-05 20:54:35 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-02-05 22:24:22 -0300 |
| commit | fabcd1879cdfaac762a307a26bdee4bfef3876f9 (patch) | |
| tree | c1916ca546f3eb2d3962d8657b4eb726c8f26923 /libre/grub/0005-10_linux-fix-grouping-of-tests.patch | |
| parent | 59b2db03d1ded22f236c5ee6f01bb0c9e86877e5 (diff) | |
| download | abslibre-fabcd1879cdfaac762a307a26bdee4bfef3876f9.tar.gz abslibre-fabcd1879cdfaac762a307a26bdee4bfef3876f9.tar.bz2 abslibre-fabcd1879cdfaac762a307a26bdee4bfef3876f9.zip | |
grub-1:2.02.rc1-1.parabola1: updating version
Diffstat (limited to 'libre/grub/0005-10_linux-fix-grouping-of-tests.patch')
| -rw-r--r-- | libre/grub/0005-10_linux-fix-grouping-of-tests.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libre/grub/0005-10_linux-fix-grouping-of-tests.patch b/libre/grub/0005-10_linux-fix-grouping-of-tests.patch deleted file mode 100644 index a57b1ecf8..000000000 --- a/libre/grub/0005-10_linux-fix-grouping-of-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 082bc9f77b200eb48a5f1147163dea9c9d02d44c -Author: Mike Gilbert <floppym@gentoo.org> -Date: Sat Mar 5 17:30:48 2016 -0500 - - 10_linux: Fix grouping of tests for GRUB_DEVICE - - Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to - mixing of || and && operators. Add some parens to help with that. - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 5a78513..de9044c 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -47,7 +47,7 @@ esac - # and mounting btrfs requires user space scanning, so force UUID in this case. - if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ -- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then -+ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} |