[autofs/f20] - add want target network-online target (bz1071591).
Ian Kent
iankent at fedoraproject.org
Wed Jan 21 05:12:40 UTC 2015
commit e3d432faafa48443c4e4b6334f6add6888db431b
Author: Ian Kent <ikent at redhat.com>
Date: Wed Jan 21 13:11:37 2015 +0800
- add want target network-online target (bz1071591).
...fs-5.1.0-make-service-want-network-online.patch | 38 ++++++++++++++++++++
autofs.spec | 7 +++-
2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/autofs-5.1.0-make-service-want-network-online.patch b/autofs-5.1.0-make-service-want-network-online.patch
new file mode 100644
index 0000000..25d81a5
--- /dev/null
+++ b/autofs-5.1.0-make-service-want-network-online.patch
@@ -0,0 +1,38 @@
+autofs-5.1.0 - make service want network-online
+
+From: Ian Kent <ikent at redhat.com>
+
+autofs often fails to start properly in Fedora with recent systemd.
+
+Changing the systemd unit to Want the network-online target works
+around this.
+
+I'm not sure if this will cause problems for people that use file
+maps and expect autofs to start without the network up but I hope
+that's a small minority, if there are any at all.
+---
+ CHANGELOG | 1 +
+ samples/autofs.service.in | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- autofs-5.0.7.orig/CHANGELOG
++++ autofs-5.0.7/CHANGELOG
+@@ -61,6 +61,7 @@
+ - fix get_nfs_info() probe.
+ - fix portmap lookup.
+ - fix ipv6 libtirpc getport.
++- make service want network-online.
+
+ 25/07/2012 autofs-5.0.7
+ =======================
+--- autofs-5.0.7.orig/samples/autofs.service.in
++++ autofs-5.0.7/samples/autofs.service.in
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Automounts filesystems on demand
+-After=network.target ypbind.service sssd.service
++After=network.target ypbind.service sssd.service network-online.target
++Wants=network-online.target
+
+ [Service]
+ Type=forking
diff --git a/autofs.spec b/autofs.spec
index c5ca848..d0acaf1 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -8,7 +8,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.0.7
-Release: 41%{?dist}
+Release: 42%{?dist}
Epoch: 1
License: GPLv2+
Group: System Environment/Daemons
@@ -109,6 +109,7 @@ Patch93: autofs-5.0.8-fix-fix-ipv6-libtirpc-getport.patch
Patch94: autofs-5.0.8-get_nfs_info-should-query-portmapper-if-port-is-not-given.patch
Patch95: autofs-5.0.8-fix-ipv6-libtirpc-getport-proto-not-set.patch
Patch96: autofs-5.0.8-fix-portmap-not-trying-proto-v2.patch
+Patch97: autofs-5.1.0-make-service-want-network-online.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with_systemd}
BuildRequires: systemd-units
@@ -261,6 +262,7 @@ echo %{version}-%{release} > .version
%patch94 -p1
%patch95 -p1
%patch96 -p1
+%patch97 -p1
%build
LDFLAGS=-Wl,-z,now
@@ -352,6 +354,9 @@ fi
%dir /etc/auto.master.d
%changelog
+* Wed Jan 21 2015 Ian Kent <ikent at redhat.com> - 1:5.0.7-42
+- make service want network-online (bz1071591).
+
* Tue Dec 24 2013 Ian Kent <ikent at redhat.com> - 1:5.0.7-40
- fix patch name and asscociated changelog entry.
More information about the scm-commits
mailing list