diff options
| author | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-01-07 17:17:30 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-01-13 19:07:53 -0700 |
| commit | e569121bd500127753070dadbabd8ecd4fda324a (patch) | |
| tree | 4ca0ae5109673836f71a3cc192bb74d5989c81d7 /libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch | |
| parent | 3bebbe97a48eac34e4a215fdc20d31e2d6c30fb6 (diff) | |
libre/grub: Merge changes from Arch; upgpkg 2.06→2.12
Diffstat (limited to 'libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch')
| -rw-r--r-- | libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch index 867e8feeb..b93232a41 100644 --- a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch +++ b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch @@ -1,17 +1,26 @@ -From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001 +From 7d7aba5cc8f978ce8f14c4d040fc6ef70b4a14db Mon Sep 17 00:00:00 2001 From: Christian Hesse <mail@eworm.de> Date: Wed, 10 Mar 2021 18:42:25 +0100 -Subject: [PATCH] 00_header: add GRUB_COLOR_* variables +Subject: [PATCH 1/4] 00_header: add GRUB_COLOR_* variables + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/514d26f6eb551b33974a7f05bbc70009f7081a1b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/fa9d34525f424546cf83cf396ef7d6d4b817640b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/34aabe57e67b8951448b8210ba2fd1b41ac6d19f + +Co-Authored-By: Tobias Powalowski <tpowa@archlinux.org> (2013) +Co-Authored-By: Christian Hesse <eworm@archlinux.org> (2021) --- util/grub-mkconfig.in | 2 ++ util/grub.d/00_header.in | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a..1189d95f9 100644 +index 32c480dae..1a945085c 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ +@@ -250,6 +250,8 @@ export GRUB_DEFAULT \ GRUB_BACKGROUND \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ @@ -21,7 +30,7 @@ index f8cbb8d7a..1189d95f9 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a90233e..c5955df00 100644 +index 6a316a5ba..6816e09d4 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -125,6 +125,14 @@ cat <<EOF @@ -39,3 +48,6 @@ index 93a90233e..c5955df00 100644 serial=0; gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do +-- +2.43.0 + |