[node-patches] Change in ovirt-node[master]: f20+: Use dracut-config-generic

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: f20+: Use dracut-config-generic
......................................................................

f20+: Use dracut-config-generic

… to disable dracut's hostonly mode

Change-Id: Ifdd05a2d5046ace601ef066ea53ad34f5169f490
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/common-pkgs.ks
M recipe/ovirt20-pkgs.ks
M recipe/rhevh7-pkgs.ks
M tools/edit-node
4 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/37/27037/1

diff --git a/recipe/common-pkgs.ks b/recipe/common-pkgs.ks
index 0d41d72..3752be1 100644
--- a/recipe/common-pkgs.ks
+++ b/recipe/common-pkgs.ks
@@ -22,7 +22,7 @@
 python-libs
 python-setuptools
 PyPAM
-db4
+#db4
 # debugging
 hdparm
 sos
diff --git a/recipe/ovirt20-pkgs.ks b/recipe/ovirt20-pkgs.ks
index 95511c5..15a7186 100644
--- a/recipe/ovirt20-pkgs.ks
+++ b/recipe/ovirt20-pkgs.ks
@@ -14,3 +14,6 @@
 
 # Explicitly add these package, to prevent yum from pulling in the debug versions
 kernel-modules-extra
+
+# To disable hostonly mode
+dracut-config-generic
diff --git a/recipe/rhevh7-pkgs.ks b/recipe/rhevh7-pkgs.ks
index 6ea8ed6..f64a4b9 100644
--- a/recipe/rhevh7-pkgs.ks
+++ b/recipe/rhevh7-pkgs.ks
@@ -16,3 +16,6 @@
 #default plugins
 ovirt-node-plugin-snmp
 ovirt-node-plugin-cim
+
+# To disable hostonly mode
+dracut-config-generic
diff --git a/tools/edit-node b/tools/edit-node
index 0d8eab5..d794ef2 100755
--- a/tools/edit-node
+++ b/tools/edit-node
@@ -1222,11 +1222,11 @@
             dracut_conf.write('add_drivers+="isofs"\n')
             dracut_conf.write('hostonly="no"\n')
             dracut_conf.close()
-        cmd = 'sed -ie \'s/^hostonly="yes"/hostonly="no"/\' ' + \
-              '/usr/lib/dracut/dracut.conf.d/01-dist.conf'
-        f = subprocess.Popen(cmd, shell=True, stdout=PIPE, stderr=STDOUT,
-                             preexec_fn=self._chroot)
-        output, err = f.communicate()
+#        cmd = 'sed -ie \'s/^hostonly="yes"/hostonly="no"/\' ' + \
+#              '/usr/lib/dracut/dracut.conf.d/01-dist.conf'
+#        f = subprocess.Popen(cmd, shell=True, stdout=PIPE, stderr=STDOUT,
+#                             preexec_fn=self._chroot)
+#        output, err = f.communicate()
         cmd = "rpm -q kernel"
         f = subprocess.Popen(cmd, shell=True, stdout=PIPE, stderr=STDOUT,
                              preexec_fn=self._chroot)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdd05a2d5046ace601ef066ea53ad34f5169f490
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>