Merge branch 'master' of ssh://pkgs.fedoraproject.org/ypbind
This commit is contained in:
commit
c0289858fc
@ -7,22 +7,30 @@
|
|||||||
# itself. If $NISDOMAIN is not defined, it reads config file.
|
# itself. If $NISDOMAIN is not defined, it reads config file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
TIMEOUT=5
|
||||||
DOMAINNAME=`domainname`
|
DOMAINNAME=`domainname`
|
||||||
if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
|
if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
|
||||||
echo -n $"Setting NIS domain: "
|
echo -n $"Setting NIS domain: "
|
||||||
|
seconds=0
|
||||||
|
while [ $seconds -lt $TIMEOUT ]; do
|
||||||
if [ -n "$NISDOMAIN" ]; then
|
if [ -n "$NISDOMAIN" ]; then
|
||||||
domainname $NISDOMAIN
|
domainname $NISDOMAIN
|
||||||
echo $"'$NISDOMAIN' (environment variable)"
|
echo $"'$NISDOMAIN' (environment variable)"
|
||||||
|
break
|
||||||
else # See if the domain is set in config file
|
else # See if the domain is set in config file
|
||||||
NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf`
|
NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf`
|
||||||
if [ -n "$NISDOMAIN" ]; then
|
if [ -n "$NISDOMAIN" ]; then
|
||||||
domainname $NISDOMAIN
|
domainname $NISDOMAIN
|
||||||
echo $"'$NISDOMAIN' (/etc/yp.conf)"
|
echo $"'$NISDOMAIN' (/etc/yp.conf)"
|
||||||
else
|
break
|
||||||
logger -t ypbind $"domain not found"
|
else
|
||||||
exit 1
|
seconds=$(($seconds+1))
|
||||||
|
sleep 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
# Give up if NISDOMAIN is still not set
|
||||||
|
[ -z "$NISDOMAIN" ] && logger -t ypbind $"domain not found" && exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#/etc/rpc check
|
#/etc/rpc check
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
|
Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
|
||||||
Requires=rpcbind.service
|
Requires=rpcbind.service
|
||||||
|
Wants=nss-user-lookup.target
|
||||||
After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service
|
After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service
|
||||||
Before=systemd-user-sessions.service
|
Before=systemd-user-sessions.service
|
||||||
Before=nss-user-lookup.target
|
Before=nss-user-lookup.target
|
||||||
|
@ -112,6 +112,15 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
|
|||||||
* Fri May 19 2017 Matej Mužila <mmuzila@gmail.com> - 3:2.4-1
|
* Fri May 19 2017 Matej Mužila <mmuzila@gmail.com> - 3:2.4-1
|
||||||
- Update to version 2.4 supporting IPv6
|
- Update to version 2.4 supporting IPv6
|
||||||
|
|
||||||
|
* Wed Mar 29 2017 Petr Kubat <pkubat@redhat.com> - 3:1.38-10
|
||||||
|
- Wait a while for dhcp to set up the domain (#1170400)
|
||||||
|
|
||||||
|
* Mon Mar 20 2017 Petr Kubat <pkubat@redhat.com> - 3:1.38-9
|
||||||
|
- Add a Wants dependency on nss-user-lookup.target (#1282440)
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.38-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Nov 23 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3:1.38-7
|
* Wed Nov 23 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3:1.38-7
|
||||||
- Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893).
|
- Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893).
|
||||||
- Add check for systemd/sd-daemon.h to ypbind-systemdso.patch.
|
- Add check for systemd/sd-daemon.h to ypbind-systemdso.patch.
|
||||||
|
Loading…
Reference in New Issue
Block a user