1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
25 lines
1013 B
Diff
25 lines
1013 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jan Hlavac <jhlavac@redhat.com>
|
|
Date: Tue, 10 Apr 2018 16:56:28 +0200
|
|
Subject: [PATCH] BLS: Use ${etcdefaultgrub} instead of /etc/...
|
|
|
|
Inside the grub-switch-to-blscfg script the ${etcdefaultgrub} variable
|
|
is used. So replace the hardcoded /etc/default/grub with it.
|
|
---
|
|
util/grub-switch-to-blscfg.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
|
|
index f740b8f4d03..eae3c379e4a 100644
|
|
--- a/util/grub-switch-to-blscfg.in
|
|
+++ b/util/grub-switch-to-blscfg.in
|
|
@@ -252,7 +252,7 @@ if [[ "${GENERATE}" -eq 1 ]] ; then
|
|
cp -af "${GRUB_CONFIG_FILE}${backupsuffix}" "${GRUB_CONFIG_FILE}"
|
|
sed -i"${backupsuffix}" \
|
|
-e 's,^GRUB_ENABLE_BLSCFG=.*,GRUB_ENABLE_BLSCFG=false,' \
|
|
- /etc/default/grub
|
|
+ "${etcdefaultgrub}"
|
|
gettext_printf "Updating %s failed\n" "${GRUB_CONFIG_FILE}"
|
|
exit 1
|
|
fi
|