diff --git a/51-dracut-rescue-postinst.sh b/51-dracut-rescue-postinst.sh deleted file mode 100755 index 67f5b7174b..0000000000 --- a/51-dracut-rescue-postinst.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -export LANG=C - -KERNEL_VERSION="$1" -KERNEL_IMAGE="$2" - -[[ -f /etc/os-release ]] && . /etc/os-release - -if [[ ! -f /etc/machine-id ]] || [[ ! -s /etc/machine-id ]]; then - systemd-machine-id-setup -fi - -[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id - -[[ $MACHINE_ID ]] || exit 1 -[[ -f $KERNEL_IMAGE ]] || exit 1 - -INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img" -NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}" - -[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0 - -dropindirs_sort() -{ - suffix=$1; shift - args=("$@") - files=$( - while (( $# > 0 )); do - for i in ${1}/*${suffix}; do - [[ -f $i ]] && echo ${i##*/} - done - shift - done | sort -Vu - ) - - for f in $files; do - for d in "${args[@]}"; do - if [[ -f "$d/$f" ]]; then - echo "$d/$f" - continue 2 - fi - done - done -} - -# source our config dir -for f in $(dropindirs_sort ".conf" "/etc/dracut.conf.d" "/usr/lib/dracut/dracut.conf.d"); do - [[ -e $f ]] && . "$f" -done - -[[ $dracut_rescue_image != "yes" ]] && exit 0 - -if [[ ! -f $INITRDFILE ]]; then - dracut --no-hostonly -a "rescue" "$INITRDFILE" "$KERNEL_VERSION" - ((ret+=$?)) -fi - -if [[ ! -f $NEW_KERNEL_IMAGE ]]; then - cp --reflink=auto "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE" - ((ret+=$?)) -fi - -new-kernel-pkg --install "$KERNEL_VERSION" --kernel-image "$NEW_KERNEL_IMAGE" --initrdfile "$INITRDFILE" --banner "$NAME $VERSION_ID Rescue $MACHINE_ID" - -((ret+=$?)) - -exit $ret diff --git a/dracut.spec b/dracut.spec index b1a84eb6b1..e89a987365 100644 --- a/dracut.spec +++ b/dracut.spec @@ -278,11 +278,6 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1* echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf -%if 0%{?rhel} > 0 && 0%{?rhel} <= 8 -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d -install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh -%endif - %files %if %{with doc} %doc README.md HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg @@ -479,8 +474,5 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %files config-rescue %{dracutlibdir}/dracut.conf.d/02-rescue.conf %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install -%if 0%{?rhel} > 0 && 0%{?rhel} <= 8 -%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh -%endif %changelog