[initscripts/f20] use DefaultDependencies=no in fedora-domainname

[Lukáš Nykrýn]

commit 1c48d661f449158e1ed65ec274a2ca849dad393b
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Mar 26 15:46:09 2014 +0100

    use DefaultDependencies=no in fedora-domainname

 ...-fedora-domainname-DefaultDependencies-no.patch |   25 ++++++++++++++++++++
 initscripts.spec                                   |    8 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-fedora-domainname-DefaultDependencies-no.patch b/0001-fedora-domainname-DefaultDependencies-no.patch
new file mode 100644
index 0000000..4a1935c
--- /dev/null
+++ b/0001-fedora-domainname-DefaultDependencies-no.patch
@@ -0,0 +1,25 @@
+From fc38d5eead7a1477c6fe580b224c7a6e113d52fe Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn at redhat.com>
+Date: Mon, 3 Mar 2014 16:11:33 +0100
+Subject: [PATCH 1/4] fedora-domainname: DefaultDependencies=no
+
+---
+ systemd/system/fedora-domainname.service | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/systemd/system/fedora-domainname.service b/systemd/system/fedora-domainname.service
+index e501a13..d5e0ff5 100644
+--- a/systemd/system/fedora-domainname.service
++++ b/systemd/system/fedora-domainname.service
+@@ -1,6 +1,8 @@
+ [Unit]
+ Description=Read and set NIS domainname from /etc/sysconfig/network
+ Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service
++DefaultDependencies=no
++Conflicts=shutdown.target
+ 
+ [Service]
+ ExecStart=/lib/systemd/fedora-domainname
+-- 
+1.8.5.3
+
diff --git a/initscripts.spec b/initscripts.spec
index cc4842d..2e223eb 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,9 +4,10 @@ Version: 9.51
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
+Patch0: 0001-fedora-domainname-DefaultDependencies-no.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes: initscripts-legacy <= 9.39
 Requires: /bin/awk, sed, coreutils
@@ -55,6 +56,8 @@ Currently, this consists of various memory checking code.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 make
 
@@ -219,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed Mar 26 2014 Lukáš Nykrýn <lnykryn at redhat.com> - 9.51-2
+- fedora-domainname service should use DefaultDependencies=no
+
 * Tue Jan 14 2014 Lukáš Nykrýn <lnykryn at redhat.com> 9.51-1
 - readonly-root: bind-mount only necessary subset of entries in rwtab
 - readonly-root: Add /var/log/audit/audit.log to rwtab