Ignore bls.conf during adding new kernel

i8 changed/i8/grub2-2.02-150.el8.inferit.2
Arkady L. Shane 8 months ago
parent c1d59137d6
commit fe6d0ed55f
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -93,13 +93,9 @@ case "$COMMAND" in
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR" [[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
BLS_ID="${MACHINE_ID}-${KERNEL_VERSION}" BLS_ID="${MACHINE_ID}-${KERNEL_VERSION}"
BLS_TARGET="${BLS_DIR}/${BLS_ID}.conf" BLS_TARGET="${BLS_DIR}/${BLS_ID}.conf"
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
else
mkbls "${KERNEL_VERSION}" \ mkbls "${KERNEL_VERSION}" \
"$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \ "$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \
>"${BLS_TARGET}" >"${BLS_TARGET}"
fi
LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,')" LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,')"
INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,')" INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,')"

@ -11,7 +11,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 150%{?dist}.inferit.1 Release: 150%{?dist}.inferit.2
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -521,6 +521,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jan 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.2
- Ignore bls.conf during adding new kernel
* Fri Dec 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.1 * Fri Dec 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.1
- Fix condition in Conflicts - Fix condition in Conflicts

Loading…
Cancel
Save