You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.0 KiB
26 lines
1.0 KiB
8 months ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
||
|
|
Date: Tue, 18 Oct 2022 14:15:28 -0400
|
||
|
|
Subject: [PATCH] switch-to-blscfg: don't assume newline at end of cfg
|
||
|
|
|
||
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
||
|
|
---
|
||
|
|
util/grub-switch-to-blscfg.in | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
|
||
|
|
index eeea130770..5a97954c39 100644
|
||
|
|
--- a/util/grub-switch-to-blscfg.in
|
||
|
|
+++ b/util/grub-switch-to-blscfg.in
|
||
|
|
@@ -277,7 +277,9 @@ if grep '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" \
|
||
|
|
fi
|
||
|
|
GENERATE=1
|
||
|
|
elif ! grep -q '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" ; then
|
||
|
|
- if ! echo 'GRUB_ENABLE_BLSCFG=true' >> "${etcdefaultgrub}" ; then
|
||
|
|
+ # prepend in case admins have been bad at newlines
|
||
|
|
+ sed -i '1iGRUB_ENABLE_BLSCFG=true' "${etcdefaultgrub}"
|
||
|
|
+ if ! grep -q '^GRUB_ENABLE_BLSCFG=true' "${etcdefaultgrub}" ; then
|
||
|
|
gettext_printf "Updating %s failed\n" "${etcdefaultgrub}"
|
||
|
|
exit 1
|
||
|
|
fi
|