From a51097a820b17fe1818edce59fcdf295de5d3de7 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Thu, 2 Mar 2023 15:48:41 +0800 Subject: [PATCH] fix remove dtb-xxx dir failed https://bugzilla.openanolis.cn/show_bug.cgi?id=4271 Signed-off-by: Chunmei Xu --- 20-grub.install | 2 +- grub2.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/20-grub.install b/20-grub.install index 2a0ac32..7391910 100755 --- a/20-grub.install +++ b/20-grub.install @@ -62,7 +62,7 @@ case "$COMMAND" in "$KERNEL_DIR"/dtb do [[ -e "$i" ]] || continue - rm -f "/boot/${i##*/}-${KERNEL_VERSION}" + rm -rf "/boot/${i##*/}-${KERNEL_VERSION}" cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}" command -v restorecon &>/dev/null && \ restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}" diff --git a/grub2.spec b/grub2.spec index d6c657c..150af1f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1,4 +1,4 @@ -%define anolis_release 8 +%define anolis_release 9 %global _lto_cflags %{nil} %undefine _hardened_build @@ -505,6 +505,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Thu Mar 02 2023 Chunmei Xu - 2.06-9 +- fix remove dtb-xxx dir failed + * Mon Dec 19 2022 Funda Wang - 2.06-8 - Deal with gettext-runtime migration -- Gitee