[node-patches] Change in ovirt-node[master]: fix default multipath conf on non-el6 hosts

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: fix default multipath conf on non-el6 hosts
......................................................................

fix default multipath conf on non-el6 hosts

getuid_callout does not work on f18/f19

Change-Id: I1cdb1bdf9f0680f310d016f2bb61bac38b96ad0b
Bug-Url:  https://bugzilla.redhat.com/975109
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M ovirt-node.spec.in
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/09/15809/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index e0abb09..7489a1a 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -8,6 +8,7 @@
 %define is_centos_systemd %(test 0%{?centos} -ne 0 && test %{?centos} -ge 7 && echo 1 || echo 0)
 %define is_systemd %( test %{is_rhel_systemd} -eq 1 || test %{is_centos_systemd} = 1 || test %{is_fedora_systemd} = 1 && echo 1 || echo 0)
 %define dracutdir %(test -e /usr/share/dracut && echo "/usr/share/dracut/modules.d" || echo "/usr/lib/dracut/modules.d")
+%define is_el6 %(test 0%{centos} -eq 06 || test 0%{rhel} -eq 06 && echo 1 || echo 0)
 
 
 Summary:        The %{product_family} daemons/scripts
@@ -345,12 +346,19 @@
 patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
 %endif
 #use all hard-coded defaults for multipath
-# except for getuid_callout where we need replace-whitespace
+# except for getuid_callout where we need to replace-whitespace on EL6
+%if %{is_el6}
 cat > /etc/multipath.conf << \EOF_multipath_conf
 defaults {
     getuid_callout "/lib/udev/scsi_id --replace-whitespace --whitelisted --device=/dev/%n"
 }
 EOF_multipath_conf
+%else
+cat > /etc/multipath.conf << \EOF_multipath_conf2
+#Use Defaults
+EOF_multipath_conf2
+%endif
+
 #release info for dracut to pick it up into initramfs
 # remove symlink to keep original redhat-release
 rm -f /etc/system-release


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cdb1bdf9f0680f310d016f2bb61bac38b96ad0b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>