e83cdd
From 5541b0c46f02f678c698aa523db7a86dde82a947 Mon Sep 17 00:00:00 2001
e83cdd
From: Lukas Nykryn <lnykryn@redhat.com>
e83cdd
Date: Thu, 25 Oct 2018 15:30:36 +0200
e83cdd
Subject: [PATCH] dracut.install: call dracut with --force
e83cdd
e83cdd
The kernel-install is called even if you run make install.
e83cdd
Since we don't call dracut with -f a second make install will fail
e83cdd
because initrd with same version is already there.
e83cdd
This makes kernel developers feel miserable.
e83cdd
e83cdd
https://bugzilla.redhat.com/show_bug.cgi?id=1642402
e83cdd
e83cdd
Cherry-picked from: 48c283a2
e83cdd
Resolves: #1642402
e83cdd
---
e83cdd
 50-dracut.install        | 2 +-
e83cdd
 51-dracut-rescue.install | 2 +-
e83cdd
 2 files changed, 2 insertions(+), 2 deletions(-)
e83cdd
e83cdd
diff --git a/50-dracut.install b/50-dracut.install
e83cdd
index ec59dcb3..139ff82e 100755
e83cdd
--- a/50-dracut.install
e83cdd
+++ b/50-dracut.install
e83cdd
@@ -49,7 +49,7 @@ case "$COMMAND" in
e83cdd
                 break
e83cdd
             fi
e83cdd
         done
e83cdd
-	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
e83cdd
+	dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
e83cdd
         ret=$?
e83cdd
 	;;
e83cdd
     remove)
e83cdd
diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
e83cdd
index 426ddee5..0580062f 100755
e83cdd
--- a/51-dracut-rescue.install
e83cdd
+++ b/51-dracut-rescue.install
e83cdd
@@ -98,7 +98,7 @@ case "$COMMAND" in
e83cdd
         fi
e83cdd
 
e83cdd
         if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
e83cdd
-            dracut --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
e83cdd
+            dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
e83cdd
             ((ret+=$?))
e83cdd
         fi
e83cdd
 
e83cdd