[kexec-tools] omit dash module
Dave Young
yangrr at fedoraproject.org
Thu Jul 12 03:20:58 UTC 2012
commit b14b69224296442aa7574c6e58ca553ac6626211
Author: Dave Young <dyoung at redhat.com>
Date: Thu Jul 12 11:15:35 2012 +0800
omit dash module
dash is be default omited in f17, but we use -o in command line so our omit
modules list will overwrite the system configs, so dash will be installed to
initramfs.
Here avoid install dash by adding it to the '-o' list
Also remove dash dependency from rpm spec
Signed-off-by: Dave Young <dyoung at redhat.com>
Acked-by: Vivek Goyal <vgoyal at redhat.com>
kexec-tools.spec | 1 -
mkdumprd | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 8ca19e4..f3a265e 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -37,7 +37,6 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(pre): coreutils sed zlib
Requires: busybox >= 1.2.0, dracut, dracut-network
-BuildRequires: dash
BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel bzip2-devel
BuildRequires: pkgconfig intltool gettext
BuildRequires: systemd-units
diff --git a/mkdumprd b/mkdumprd
index 81627c8..d1223b2 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -13,7 +13,7 @@ SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2)
[ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash"
extra_modules=""
-dracut_args=("--hostonly" "--add" "kdumpbase" "--add" "fstab-sys" "--add" "kernel-modules" "-c" "/dev/null" "-I" "/sbin/makedumpfile" "-o" "plymouth")
+dracut_args=("--hostonly" "--add" "kdumpbase" "--add" "fstab-sys" "--add" "kernel-modules" "-c" "/dev/null" "-I" "/sbin/makedumpfile" "-o" "plymouth dash")
add_dracut_arg() {
while [ $# -gt 0 ];
More information about the scm-commits
mailing list