diff options
| author | Tomas Hozza <thozza@redhat.com> | 2014-07-18 13:36:08 +0200 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2014-07-18 13:36:08 +0200 |
| commit | 0cc3dc9157079bda7416a6ce73bf1447fba2710a (patch) | |
| tree | 4d8096a5a3dee67923156dbdd037f3e5ed0f1b98 | |
| parent | 68221b27b36851f0aee32c7eabe2e4ab5dc74441 (diff) | |
| parent | 55b0a6bfc27b889f52ab1b30a5f5f561ccde4716 (diff) | |
| download | bind-0cc3dc9157079bda7416a6ce73bf1447fba2710a.tar.gz bind-0cc3dc9157079bda7416a6ce73bf1447fba2710a.tar.xz bind-0cc3dc9157079bda7416a6ce73bf1447fba2710a.zip | |
Merge branch 'master' into f21
| -rw-r--r-- | bind.spec | 5 | ||||
| -rw-r--r-- | named-chroot.service | 3 | ||||
| -rw-r--r-- | named-sdb-chroot.service | 3 | ||||
| -rw-r--r-- | named-sdb.service | 3 | ||||
| -rw-r--r-- | named.service | 3 |
5 files changed, 12 insertions, 5 deletions
@@ -28,7 +28,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.9.5 -Release: 7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 8%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -929,6 +929,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Jul 18 2014 Tomas Hozza <thozza@redhat.com> 32:9.9.5-8.P1 +- Use network-online.target instead of network.target (#1117086) + * Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> 32:9.9.5-7.P1 - fix license handling diff --git a/named-chroot.service b/named-chroot.service index 39d3700..1829b3d 100644 --- a/named-chroot.service +++ b/named-chroot.service @@ -5,10 +5,11 @@ [Unit] Description=Berkeley Internet Name Domain (DNS) Wants=nss-lookup.target +Wants=network-online.target Requires=named-chroot-setup.service Before=nss-lookup.target -After=network.target After=named-chroot-setup.service +After=network-online.target [Service] Type=forking diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service index 09b7974..121f54d 100644 --- a/named-sdb-chroot.service +++ b/named-sdb-chroot.service @@ -5,10 +5,11 @@ [Unit] Description=Berkeley Internet Name Domain (DNS) Wants=nss-lookup.target +Wants=network-online.target Requires=named-sdb-chroot-setup.service Before=nss-lookup.target -After=network.target After=named-sdb-chroot-setup.service +After=network-online.target [Service] Type=forking diff --git a/named-sdb.service b/named-sdb.service index e0cd31c..99eb0e8 100644 --- a/named-sdb.service +++ b/named-sdb.service @@ -2,9 +2,10 @@ Description=Berkeley Internet Name Domain (DNS) Wants=nss-lookup.target Wants=named-setup-rndc.service +Wants=network-online.target Before=nss-lookup.target -After=network.target After=named-setup-rndc.service +After=network-online.target [Service] Type=forking diff --git a/named.service b/named.service index 7e48c89..3e5ed9c 100644 --- a/named.service +++ b/named.service @@ -2,9 +2,10 @@ Description=Berkeley Internet Name Domain (DNS) Wants=nss-lookup.target Wants=named-setup-rndc.service +Wants=network-online.target Before=nss-lookup.target -After=network.target After=named-setup-rndc.service +After=network-online.target [Service] Type=forking |