[node-patches] Change in ovirt-node[ovirt-3.5]: Bundle libvirtd.upstart

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Bundle libvirtd.upstart
......................................................................

Bundle libvirtd.upstart

We need to bundle this file, because all packages are installed without the
documentation. And this file is part of the documentation of libvirt.

Change-Id: Iaf81190054794349846de8f359e89ad6852a8c5e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1235350
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M data/Makefile.am
A data/libvirtd.conf
M ovirt-node.spec.in
3 files changed, 54 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/43/43143/1

diff --git a/data/Makefile.am b/data/Makefile.am
index 32437e5..f3dcdb1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,12 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 nodeconfdir = $(sysconfdir)/ovirt-node/
+upstartconfdir = $(sysconfdir)/init/
 
 dist_nodeconf_DATA = \
   logging.conf \
   logging.debug.conf
+
+# The file is taken from the el6 libvirtd package
+dist_upstartconf_DATA = \
+  libvirtd.conf
diff --git a/data/libvirtd.conf b/data/libvirtd.conf
new file mode 100644
index 0000000..e620f41
--- /dev/null
+++ b/data/libvirtd.conf
@@ -0,0 +1,47 @@
+# libvirtd upstart job
+#
+# XXX wait for rc to get all dependent initscripts started
+# from sysv libvirtd initscript: Required-Start: $network messagebus
+start on stopped rc RUNLEVEL=[345]
+stop on runlevel [!345]
+
+respawn
+
+script
+    LIBVIRTD_CONFIG=
+    LIBVIRTD_ARGS=
+    KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+    if [ -f /etc/sysconfig/libvirtd ]; then
+        . /etc/sysconfig/libvirtd
+    fi
+
+    export QEMU_AUDIO_DRV
+    export SDL_AUDIODRIVER
+    export KRB5_KTNAME
+
+    LIBVIRTD_CONFIG_ARGS=
+    if [ -n "$LIBVIRTD_CONFIG" ]; then
+        LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
+    fi
+
+    # DAEMON_COREFILE_LIMIT from /etc/sysconfig/libvirtd is not handled
+    # automatically
+    if [ -n "$DAEMON_COREFILE_LIMIT" ]; then
+        ulimit -c "$DAEMON_COREFILE_LIMIT"
+    fi
+
+    # LIBVIRTD_NOFILES_LIMIT from /etc/sysconfig/libvirtd is not handled
+    # automatically
+    if [ -n "$LIBVIRTD_NOFILES_LIMIT" ]; then
+        ulimit -n "$LIBVIRTD_NOFILES_LIMIT"
+    fi
+    mkdir -p /var/cache/libvirt
+    rm -rf /var/cache/libvirt/*
+
+    exec /usr/sbin/libvirtd $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
+end script
+
+post-stop script
+    rm -rf /var/cache/libvirt/*
+end script
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 91b72bd..0105aff 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -743,7 +743,8 @@
 %{_sysconfdir}/modprobe.d/ovirt-qla4xxx.conf
 %{_sysconfdir}/modprobe.d/bonding.conf
 %{_libexecdir}/ovirt-node/hooks
-
+# Bundle libvirtd upstart conf: rhbz#1235350
+%{_sysconfdir}/init/libvirtd.conf
 
 %doc COPYING
 # should be ifarch i386


-- 
To view, visit https://gerrit.ovirt.org/43143
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf81190054794349846de8f359e89ad6852a8c5e
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>