Drop 20-grubby.install plugin for kernel-install
This commit is contained in:
parent
f42ae67ed3
commit
b54029abba
@ -1,51 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [[ ! -x /sbin/new-kernel-pkg ]]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
COMMAND="$1"
|
|
||||||
KERNEL_VERSION="$2"
|
|
||||||
BOOT_DIR_ABS="$3"
|
|
||||||
KERNEL_IMAGE="$4"
|
|
||||||
|
|
||||||
KERNEL_DIR="${KERNEL_IMAGE%/*}"
|
|
||||||
[[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
|
|
||||||
case "$COMMAND" in
|
|
||||||
add)
|
|
||||||
if [[ "${KERNEL_DIR}" != "/boot" ]]; then
|
|
||||||
for i in \
|
|
||||||
"$KERNEL_IMAGE" \
|
|
||||||
"$KERNEL_DIR"/System.map \
|
|
||||||
"$KERNEL_DIR"/config \
|
|
||||||
"$KERNEL_DIR"/zImage.stub \
|
|
||||||
"$KERNEL_DIR"/dtb \
|
|
||||||
; do
|
|
||||||
[[ -e "$i" ]] || continue
|
|
||||||
cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
|
||||||
command -v restorecon &>/dev/null && \
|
|
||||||
restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
|
|
||||||
done
|
|
||||||
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
|
||||||
i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
|
|
||||||
if [[ -e "$i" ]]; then
|
|
||||||
cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
|
||||||
command -v restorecon &>/dev/null && \
|
|
||||||
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
/sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
|
|
||||||
/sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
|
|
||||||
/sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
|
|
||||||
;;
|
|
||||||
remove)
|
|
||||||
/sbin/new-kernel-pkg --package "kernel${flavor+-$flavor}" --rminitrd --rmmoddep --remove "$KERNEL_VERSION" || exit $?
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# skip other installation plugins, if we can't find a boot loader spec conforming setup
|
|
||||||
if ! [[ -d /boot/loader/entries || -L /boot/loader/entries ]]; then
|
|
||||||
exit 77
|
|
||||||
fi
|
|
@ -67,7 +67,6 @@ Source7: systemd-journal-remote.xml
|
|||||||
Source8: systemd-journal-gatewayd.xml
|
Source8: systemd-journal-gatewayd.xml
|
||||||
Source9: 20-yama-ptrace.conf
|
Source9: 20-yama-ptrace.conf
|
||||||
Source10: systemd-udev-trigger-no-reload.conf
|
Source10: systemd-udev-trigger-no-reload.conf
|
||||||
Source11: 20-grubby.install
|
|
||||||
Source12: systemd-user
|
Source12: systemd-user
|
||||||
Source13: libsystemd-shared.abignore
|
Source13: libsystemd-shared.abignore
|
||||||
|
|
||||||
@ -665,8 +664,6 @@ cat >%{buildroot}%{system_unit_dir}/systemd-hostnamed.service.d/disable-privated
|
|||||||
PrivateDevices=no
|
PrivateDevices=no
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
install -Dm0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE11}
|
|
||||||
|
|
||||||
install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/ %{SOURCE13}
|
install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/ %{SOURCE13}
|
||||||
|
|
||||||
install -D -t %{buildroot}/usr/lib/systemd/ %{SOURCE3}
|
install -D -t %{buildroot}/usr/lib/systemd/ %{SOURCE3}
|
||||||
@ -1033,6 +1030,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 10 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-3
|
* Thu Feb 10 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-3
|
||||||
- Add pam_namespace to systemd-user pam config (rhbz#2053098)
|
- Add pam_namespace to systemd-user pam config (rhbz#2053098)
|
||||||
|
- Drop 20-grubby.install plugin for kernel-install (rhbz#2033646)
|
||||||
|
|
||||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org>
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org>
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user