File 0039-Remove-force-parameter-from-mkinitrd.patch of Package dracut.6321

Overview Repositories Revisions Requests Users Attributes Meta

File 0039-Remove-force-parameter-from-mkinitrd.patch of Package dracut.6321

From ee275da9883bb5a3f10191f6a034d90dd6ba5770 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Tue, 27 May 2014 15:03:46 +0200
Subject: [PATCH] Remove --force parameter from mkinitrd

When calling 'mkinitrd' we're setting the '--force' parameter
to dracut anyway, so it doesn't make any sense to have it
as a separate parameter.

Signed-off-by: Thomas Renninger <trenn@suse.de>
---
 mkinitrd-suse.8.asc | 3 ---
 mkinitrd-suse.sh    | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mkinitrd-suse.8.asc b/mkinitrd-suse.8.asc
index a181b75..cdb8e3a 100644
--- a/mkinitrd-suse.8.asc
+++ b/mkinitrd-suse.8.asc
@@ -87,9 +87,6 @@ OPTIONS
     Disable logging to _/var/log/YaST2/mkinitrd.log_. This is useful for
     testing if you don’t want to clutter the system log.
 
-**--force**::
-    overwrite existing initramfs file.
-
 **--help**::
     print a help message and exit.
 
diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
index c02062d..7fc787e 100755
--- a/mkinitrd-suse.sh
+++ b/mkinitrd-suse.sh
@@ -23,7 +23,6 @@
 boot_dir="/boot"
 quiet=0
 host_only=1
-force=0
 logfile=/var/log/YaST2/mkinitrd.log
 dracut_cmd=dracut
 
@@ -203,8 +202,6 @@ default_kernel_images() {
     for initrd_image in $initrd_images;do
 	targets="$targets $initrd_image"
     done
-    host_only=1
-    force=1
 }
 
 while (($# > 0)); do
@@ -217,8 +214,6 @@ while (($# > 0)); do
 	    for kernel_image in $kernel_images;do
 		kernels="$kernels ${kernel_image#*-}"
 	    done
-	    host_only=1
-	    force=1
 	    ;;
 	-i) read_arg initrd_images "$@" || shift $?
 	    for initrd_image in $initrd_images;do
@@ -274,7 +269,6 @@ while (($# > 0)); do
         --version|-R)
             echo "mkinitrd: dracut compatibility wrapper"
             exit 0;;
-        --force) force=1;;
 	--quiet|-q) quiet=1;;
         *)  if [[ ! $targets ]]; then
             targets=$1
@@ -302,7 +296,8 @@ if [[ $host_only == 1 ]];then
 else
     dracut_args="${dracut_args} --no-hostonly --no-hostonly-cmdline"
 fi
-[[ $force == 1 ]]     && dracut_args="${dracut_args} --force"
+dracut_args="${dracut_args} --force"
+
 [[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}"
 [ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
 
-- 
1.8.4.5

Places

File 0039-Remove-force-parameter-from-mkinitrd.patch of Package dracut.6321

Places