[packages/dhcp_probe] - fix systemd deps version - do not generate services if target is disabled - rel 2

[baggins]

commit 1fcebd1cdebe832e20d1a177ea92aa6782c0b0f3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Aug 16 20:58:53 2013 +0200

    - fix systemd deps version
    - do not generate services if target is disabled
    - rel 2

 dhcp_probe-service-generator | 3 +++
 dhcp_probe.spec              | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/dhcp_probe.spec b/dhcp_probe.spec
index 167d3f3..e0de5d7 100644
--- a/dhcp_probe.spec
+++ b/dhcp_probe.spec
@@ -1,7 +1,7 @@
 Summary:	Tool for discovering DHCP and BootP servers
 Name:		dhcp_probe
 Version:	1.3.0
-Release:	1
+Release:	2
 License:	GPLv2+ and MIT
 Group:		Applications
 Source0:	http://www.net.princeton.edu/software/dhcp_probe/%{name}-%{version}.tar.gz
@@ -23,7 +23,7 @@ Requires(post,preun,postun):	systemd-units >= 38
 BuildRequires:	libnet-devel >= 1:1.1.6
 BuildRequires:	libpcap-devel
 Requires:	rc-scripts
-Requires:	systemd-units >= 0.38
+Requires:	systemd-units >= 38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
diff --git a/dhcp_probe-service-generator b/dhcp_probe-service-generator
index d2ab246..e88a0bc 100644
--- a/dhcp_probe-service-generator
+++ b/dhcp_probe-service-generator
@@ -2,6 +2,9 @@
 
 destunitdir=${1:-/tmp}
 
+# Do nothing if target is disabled
+[ -e /etc/systemd/system/multi-user.target.wants/dhcp_probe.target ] || exit 0
+
 [ -f /etc/sysconfig/dhcp_probe ] && . /etc/sysconfig/dhcp_probe
 
 if [ -d $destunitdir/dhcp_probe.target.wants ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dhcp_probe.git/commitdiff/1fcebd1cdebe832e20d1a177ea92aa6782c0b0f3