diff --git a/nut-2.7.3-systemdfix.patch b/nut-2.7.3-systemdfix.patch new file mode 100644 index 0000000..41887e6 --- /dev/null +++ b/nut-2.7.3-systemdfix.patch @@ -0,0 +1,12 @@ +diff -up nut-2.7.3/scripts/systemd/nut-server.service.in.systemdfix nut-2.7.3/scripts/systemd/nut-server.service.in +--- nut-2.7.3/scripts/systemd/nut-server.service.in.systemdfix 2015-04-28 09:59:05.567849447 +0200 ++++ nut-2.7.3/scripts/systemd/nut-server.service.in 2015-04-28 09:59:23.743808581 +0200 +@@ -4,7 +4,7 @@ After=local-fs.target network.target nut + # We don't Require drivers to be successfully started! This would be + # a change of behavior compared to init SysV, and could prevent from + # accessing successfully started, at least to audit a system. +-#Requires=nut-driver.service ++Wants=nut-driver.service + Before=nut-monitor.service + + [Service] diff --git a/nut.spec b/nut.spec index 48f0bc5..633172e 100644 --- a/nut.spec +++ b/nut.spec @@ -16,7 +16,7 @@ Summary: Network UPS Tools Name: nut Version: 2.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: GPLv2+ and GPLv3+ Url: http://www.networkupstools.org/ @@ -32,6 +32,7 @@ Patch6: nut-2.6.5-pthreadfix.patch Patch7: nut-2.6.5-foreground.patch Patch8: nut-2.6.5-unreachable.patch Patch9: nut-2.6.5-rmpidf.patch +Patch10: nut-2.7.3-systemdfix.patch Requires(pre): shadow-utils udev Requires(post): fileutils chkconfig systemd-units @@ -129,6 +130,7 @@ necessary to develop NUT client applications. %patch7 -p1 -b .foreground %patch8 -p1 -b .unreachable %patch9 -p1 -b .rmpidf +%patch10 -p1 -b .systemdfix sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop @@ -438,6 +440,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Tue Apr 28 2015 Michal Hlavinka - 2.7.3-2 +- start nut driver before the daemon + * Thu Apr 23 2015 Michal Hlavinka - 2.7.3-1 - nut updated to 2.7.3