[node-patches] Change in ovirt-node[ovirt-3.5]: Leave mkdumprd alone. Patch 90dmsquash-live instead

[fabiand at redhat.com]

Hello Ryan Barry,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/36867

to review the following change.

Change subject: Leave mkdumprd alone. Patch 90dmsquash-live instead
......................................................................

Leave mkdumprd alone. Patch 90dmsquash-live instead

To keep a smaller initrd, make dmsquash-live able to be included
on non-hostonly setups, so we can keep the crashkernel as small
as possible.

This is required for kdump.

Change-Id: I79bce1a1dc2f348f9f99d552fe7e3645db639e8c
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1180371
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1180377
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1095140
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/rhevh7-post.ks
1 file changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/67/36867/1

diff --git a/recipe/rhevh7-post.ks b/recipe/rhevh7-post.ks
index 61fe8c0..0fa6dfd 100644
--- a/recipe/rhevh7-post.ks
+++ b/recipe/rhevh7-post.ks
@@ -30,20 +30,19 @@
 # include dmsquash-live in dracut for kdump
 sed -ie 's/^#add_dracutmodules+=""/add_dracutmodules+="dmsquash-live"/' /etc/dracut.conf
 
-# Don't use hostonly for kdump or we'll miss dmsquash-live
-patch -d /usr/sbin -p0 << \EOF_mkdumprd
---- mkdumprd.orig       2015-01-09 11:05:44.132744400 -0700
-+++ mkdumprd    2015-01-09 11:05:56.858840503 -0700
-@@ -14,7 +14,7 @@
- SAVE_PATH=$(grep ^path $conf_file| cut -d' '  -f2)
- [ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash"
- extra_modules=""
--dracut_args=("--hostonly" "--hostonly-cmdline" "-o" "plymouth dash")
-+dracut_args=("-o" "plymouth dash")
- OVERRIDE_RESETTABLE=0
+# Make dmsquash-live able to be included on hostonly configurations
+patch -d /usr/lib/dracut/modules.d/90dmsquash-live -p0 << \EOF_dmsquash
+--- /tmp/module-setup.sh.orig   2015-01-13 07:29:57.907325412 -0700
++++ /tmp/module-setup.sh        2015-01-13 07:30:08.900364143 -0700
+@@ -3,8 +3,6 @@
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
  
- perror_exit() {
-EOF_mkdumprd
+ check() {
+-    # a live host-only image doesn't really make a lot of sense
+-    [[ $hostonly ]] && return 1
+     return 255
+ }
+EOF_dmsquash
 
 # add RHEV-H rwtab locations
 mkdir -p /rhev


-- 
To view, visit http://gerrit.ovirt.org/36867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79bce1a1dc2f348f9f99d552fe7e3645db639e8c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>