From d2fa85c0660a9c20aa4a4beb4530245fa18ae3e6 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Aug 19 2020 14:22:49 +0000 Subject: dracut.install: call dracut with --force The kernel-install is called even if you run make install. Since we don't call dracut with -f a second make install will fail because initrd with same version is already there. This makes kernel developers feel miserable. https://bugzilla.redhat.com/show_bug.cgi?id=1642402 Cherry-picked from: 48c283a2 Resolves: #1642402 patch_name: 0006.patch present_in_specfile: true location_in_specfile: 6 squash_commits: true --- diff --git a/50-dracut.install b/50-dracut.install index ec59dcb..139ff82 100755 --- a/50-dracut.install +++ b/50-dracut.install @@ -49,7 +49,7 @@ case "$COMMAND" in break fi done - dracut ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION" + dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION" ret=$? ;; remove) diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install index 426ddee..0580062 100755 --- a/51-dracut-rescue.install +++ b/51-dracut-rescue.install @@ -98,7 +98,7 @@ case "$COMMAND" in fi if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then - dracut --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION" + dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION" ((ret+=$?)) fi