Fabian Deutsch has uploaded a new change for review. Change subject: recipe: Relocate libvirtd.upstart once again ......................................................................
recipe: Relocate libvirtd.upstart once again We can not put libvirtd.conf into /etc/init - because if it is there, then some code flows in vdsm will not be triggered. We now put it outside of /etc/init so that we have the same flow on plain hosts and Node. Change-Id: I995430a256b32ad3809fcd351d1a41873fd7f961 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1239285 Signed-off-by: Fabian Deutsch <[email protected]> --- M data/Makefile.am R data/libvirtd.upstart M ovirt-node.spec.in M recipe/rhevh6-post.ks 4 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/26/43226/1 diff --git a/data/Makefile.am b/data/Makefile.am index f3dcdb1..8f75461 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,12 +16,11 @@ # 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 +dist_pkgdata_DATA = \ + libvirtd.upstart diff --git a/data/libvirtd.conf b/data/libvirtd.upstart similarity index 100% rename from data/libvirtd.conf rename to data/libvirtd.upstart diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index f74eca4..d021213 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -1021,7 +1021,7 @@ %{_sysconfdir}/modprobe.d/bonding.conf %{_libexecdir}/ovirt-node/hooks # Bundle libvirtd upstart conf: rhbz#1235350 -%{_sysconfdir}/init/libvirtd.conf +%{_datarootdir}/ovirt-node/libvirtd.upstart %license COPYING # should be ifarch i386 diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index 24ad423..4ca6fb9 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -31,7 +31,7 @@ LIBVIRT_UPSTART=$(rpm -ql libvirt | grep upstart) echo "Using ${LIBVIRT_UPSTART}" mkdir -vp $(dirname ${LIBVIRT_UPSTART}) -cp -v /etc/init/libvirtd.conf ${LIBVIRT_UPSTART} +cp -v /usr/share/ovirt-node/libvirtd.upstart ${LIBVIRT_UPSTART} echo "Configuring IPTables" # here, we need to punch the appropriate holes in the firewall -- To view, visit https://gerrit.ovirt.org/43226 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I995430a256b32ad3809fcd351d1a41873fd7f961 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
