[node-patches] Change in ovirt-node[master]: Don't start netconsole by default

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Don't start netconsole by default
......................................................................

Don't start netconsole by default

Netconsole startup fails with the default configuration. netconsole
is started by ovirt-post if configured and by defaults.Netconsole()
when configured on a running system. Don't start it in ovirt-post
if the configuration looks invalid.

Change-Id: Ib7ff7a4789bbc533f68f4aebf7ef851ddc6700b0
Signed-off-by: Ryan Barry <rbarry at redhat.com>
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=991353
---
M ovirt-node.spec.in
M scripts/ovirt-init-functions.sh.in
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/10/19810/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index a259744..a8fc84f 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -376,7 +376,7 @@
 
 
 %post
-/sbin/chkconfig --level 35 netconsole on
+/sbin/chkconfig --level 35 netconsole off
 %if ! %{is_systemd}
 /sbin/chkconfig --add ovirt-awake
 /sbin/chkconfig --add ovirt-early
diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 8ab95c7..6354aa4 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1340,7 +1340,8 @@
         service network restart 2>/dev/null
 
         # Restarting netconsole, now that the network is up, rhbz#869984
-        [[ -f "/config/etc/sysconfig/netconsole" ]] && {
+        [[ -f "/config/etc/sysconfig/netconsole" &&
+           `egrep -E "SYSLOGADDR=.+" /config/etc/sysconfig/netconsole` ]] && {
             service netconsole restart
         }
 


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

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