diff --git a/libvirt.changes b/libvirt.changes index c93f200..6c10d99 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 14 13:44:06 MDT 2014 - jfehlig@suse.com + +- Add /usr/sbin/rc{libvirtd,virtlockd,libvirt-guests} symlinks + to preserve backwards compatibility + bnc#868190 + ------------------------------------------------------------------- Tue Mar 4 11:43:25 MST 2014 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index b5db7c3..0603a69 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1276,7 +1276,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates %if %{with_libvirtd} # Currently using our own libvirtd init script rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirtd -%if ! %{with_systemd} +%if %{with_systemd} +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd +%else install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd %endif @@ -1285,6 +1287,7 @@ rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/libvirtd.conf # For other services, use the in-tree scripts %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd %else mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/virtlockd ln -s /etc/init.d/virtlockd $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd @@ -1297,6 +1300,7 @@ install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server %endif %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests +ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests %else mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirt-guests mkdir -p $RPM_BUILD_ROOT%{_sbindir} @@ -1426,10 +1430,10 @@ fi %{_unitdir}/virtlockd.socket %else %config /etc/init.d/libvirtd -%{_sbindir}/rclibvirtd %config /etc/init.d/virtlockd -%{_sbindir}/rcvirtlockd %endif +%{_sbindir}/rclibvirtd +%{_sbindir}/rcvirtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf @@ -1720,8 +1724,8 @@ fi %{_unitdir}/libvirt-guests.service %else %config /etc/init.d/libvirt-guests -%{_sbindir}/rclibvirt-guests %endif +%{_sbindir}/rclibvirt-guests %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/