[node-patches] Change in ovirt-node[master]: Use nompath instead of rd_NO_MULTIPATH on EL7

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Use nompath instead of rd_NO_MULTIPATH on EL7
......................................................................

Use nompath instead of rd_NO_MULTIPATH on EL7

rd_NO_MULTIPATH doesn't exist on EL7. Use rd_NO_MPATH instead.

clean up configure.ac a little bit so there aren't multiple
if checks with exactly the same conditions. Reuse NEW_DRACUT for
this.

Change-Id: I02e50c4de89e119aa69847539f010a7d7aeeaa51
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1155957
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M configure.ac
M recipe/common-install.ks.in
2 files changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/81/35481/1

diff --git a/configure.ac b/configure.ac
index b179e29..c4f260c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@
 AM_CONDITIONAL(TARGET_EL6, test x"$RHEL" != x || test x"$CENTOS" != x)
 AM_CONDITIONAL(TARGET_SYSTEMD, test 0$RHEL -ge 7 || test 0$FEDORA -ge 16 || test 0$CENTOS -ge 7)
 AM_CONDITIONAL(TARGET_NEW_DRACUT, test 0$RHEL -ge 7 || test 0$FEDORA -ge 15 || test 0$CENTOS -ge 7)
-AM_CONDITIONAL(TARGET_RDLIVECHECK, test 0$RHEL -ge 7 || test 0$FEDORA -ge 15 || test 0$CENTOS -ge 7)
 
 AM_COND_IF([TARGET_SYSTEMD],
     [SEMODULE_WITH_SYSTEMD=""], [SEMODULE_WITH_SYSTEMD="#"])
@@ -71,8 +70,8 @@
      [DRACUTDIR="/usr/lib/dracut/modules.d"], [DRACUTDIR="/usr/share/dracut/modules.d"])
 AC_SUBST([DRACUTDIR])
 
-AM_COND_IF([TARGET_RDLIVECHECK],
-    [BOOTLOADER_ARGS="rd.live.check rd.lvm=0"], [BOOTLOADER_ARGS="check RD_NO_LVM"])
+AM_COND_IF([TARGET_NEW_DRACUT],
+    [BOOTLOADER_ARGS="rd.live.check rd.lvm=0 nompath"], [BOOTLOADER_ARGS="check RD_NO_LVM rd_NO_MULTIPATH"])
 AC_SUBST([BOOTLOADER_ARGS])
 
 AC_ARG_WITH([image-minimizer], [AC_HELP_STRING([--with-image-minimizer],
diff --git a/recipe/common-install.ks.in b/recipe/common-install.ks.in
index 6e5ffb5..73b239d 100644
--- a/recipe/common-install.ks.in
+++ b/recipe/common-install.ks.in
@@ -10,7 +10,7 @@
 # additional default boot parameters
 # Need to use deadline Scheduler for performance, rhbz#647301
 # VM timekeeping: Do not allow C2 state, rhbz#647300
-bootloader --timeout=30 --append="@BOOTLOADER_ARGS@ rd_NO_MULTIPATH rootflags=ro crashkernel=128M elevator=deadline install quiet max_loop=256"
+bootloader --timeout=30 --append="@BOOTLOADER_ARGS@ rootflags=ro crashkernel=128M elevator=deadline install quiet max_loop=256"
 
 # not included by default in Fedora 10 livecd initramfs
 device virtio_blk


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02e50c4de89e119aa69847539f010a7d7aeeaa51
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>