Fabian Deutsch has uploaded a new change for review. Change subject: spec: Drop custom libvirt service files ......................................................................
spec: Drop custom libvirt service files Previously we preovided our own libvirtd service files because they were missing in older versions of CentOS and Fedora. But nowadays they are part of them. The old versions create problems Change-Id: I09ed730bbf70bcb4d9dcd391fa89c3798fea04aa Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1176048 Signed-off-by: Fabian Deutsch <[email protected]> --- M Makefile.am D libvirtd.service D libvirtd.upstart M ovirt-node.spec.in M recipe/common-post.ks 5 files changed, 0 insertions(+), 81 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/60/36560/1 diff --git a/Makefile.am b/Makefile.am index 3c767e9..49dfbb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,8 +35,6 @@ tests EXTRA_DIST = \ - libvirtd.service \ - libvirtd.upstart \ ovirt-node.spec \ ovirt-node.spec.in \ semodule diff --git a/libvirtd.service b/libvirtd.service deleted file mode 100644 index 7a4a625..0000000 --- a/libvirtd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Virtualization daemon -After=syslog.target -After=udev.target -After=avahi.target -After=dbus.target -Before=libvirt-guests.service -Before=ovirt-post.service - -[Service] -EnvironmentFile=-/etc/sysconfig/libvirtd -ExecStart= /usr/sbin/libvirtd $LIBVIRTD_ARGS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/libvirtd.upstart b/libvirtd.upstart deleted file mode 100644 index ef2a8de..0000000 --- a/libvirtd.upstart +++ /dev/null @@ -1,44 +0,0 @@ -# libvirtd upstart job -# -start on started messagebus -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 - - # Clean up a pidfile that might be left around - rm -f /var/run/libvirtd.pid - - 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 -f $PIDFILE - rm -rf /var/cache/libvirt/* -end script diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 788c529..e945892 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -467,16 +467,6 @@ %{__install} -d -m0755 %{buildroot}%{_libexecdir}/ovirt-node/hooks/on-boot %{__install} -d -m0755 %{buildroot}%{_libexecdir}/ovirt-node/hooks/on-changed-boot-image -%if %{is_f16} -# install libvirtd systemd service -%{__install} -p -m0644 libvirtd.service %{buildroot}%{_unitdir} -%endif -%if ! %{is_systemd} -# install libvirtd upstart job -%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/init -%{__install} -p -m0644 libvirtd.upstart %{buildroot}%{_sysconfdir}/init/libvirtd.conf -%endif - # dracut patches for rhel6 %if ! %{is_systemd} %{__install} -p -m0644 dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch %{buildroot}%{app_root} @@ -741,12 +731,6 @@ %dir %{_sysconfdir}/ovirt-config-boot.d %{_sysconfdir}/ovirt-config-boot.d/local_boot_trigger.sh -%if %{is_f16} -%{_unitdir}/libvirtd.service -%endif -%if ! %{is_systemd} -%{_sysconfdir}/init/libvirtd.conf -%endif %{_sysconfdir}/ovirt-node/logging.conf %{_sysconfdir}/ovirt-node/logging.debug.conf %{_sysconfdir}/sysconfig/modules/vlan.modules diff --git a/recipe/common-post.ks b/recipe/common-post.ks index f07b940..c45b0ef 100644 --- a/recipe/common-post.ks +++ b/recipe/common-post.ks @@ -23,9 +23,6 @@ # make sure we don't autostart virbr0 on libvirtd startup rm -f /etc/libvirt/qemu/networks/autostart/default.xml -# rhevh uses libvirtd upstart job, sysv initscript must not interfere -rm -f /etc/rc.d/init.d/libvirtd - # Remove the default logrotate daily cron job # since we run it every 10 minutes instead. rm -f /etc/cron.daily/logrotate -- To view, visit http://gerrit.ovirt.org/36560 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09ed730bbf70bcb4d9dcd391fa89c3798fea04aa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Fabian Deutsch <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
