parent
f4d0ef2c0b
commit
60d8a63357
@ -625,15 +625,6 @@ fi
|
||||
done
|
||||
fi
|
||||
%endif
|
||||
if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
|
||||
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
|
||||
ed -s /etc/nsswitch.conf <<EOF
|
||||
/^hosts: \+files \+/s/.*/hosts: files dns mdns4_minimal/
|
||||
w
|
||||
q
|
||||
EOF
|
||||
cat /etc/nsswitch.conf > %{_datadir}/lsb/nsswitch.conf
|
||||
fi
|
||||
|
||||
%post
|
||||
%ifarch %{ix86}
|
||||
@ -644,27 +635,6 @@ fi
|
||||
done
|
||||
fi
|
||||
%endif
|
||||
if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
|
||||
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
|
||||
ed -s /etc/nsswitch.conf <<EOF
|
||||
/^hosts: \+files \+/s/.*/hosts: files dns mdns4_minimal/
|
||||
w
|
||||
q
|
||||
EOF
|
||||
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ];then
|
||||
if [ -e %{_datadir}/lsb/nsswitch.conf -a -e %{_datadir}/lsb/nsswitch.conf.orig ];then
|
||||
if cmp -s %{_datadir}/lsb/nsswitch.conf /etc/nsswitch.conf;then
|
||||
cp /etc/nsswitch.conf /etc/nsswitch.conf.rpmsave
|
||||
echo "warning: /etc/nsswitch.conf saved as /etc/nsswitch.conf.rpmsave" >&2
|
||||
cat %{_datadir}/lsb/nsswitch.conf.orig >/etc/nsswitch.conf
|
||||
fi
|
||||
rm -f %{_datadir}/lsb/{nsswitch.conf,nsswitch.conf.orig}
|
||||
fi
|
||||
fi
|
||||
|
||||
%postun submod-security -p <lua>
|
||||
os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules")
|
||||
@ -784,6 +754,10 @@ os.remove("%{_datadir}/lsb")
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 25 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-21
|
||||
- remove nsswitch handling - broken and unnecessary
|
||||
(#986728, #915147)
|
||||
|
||||
* Tue Aug 13 2013 Ondrej Vasik <ovasik@redhat.com> - 4.1-20
|
||||
- fix the patch for aarch64 support to be not patch of
|
||||
patch but real patch (sorry, simply, fix aarch64 build)
|
||||
|
Loading…
Reference in New Issue
Block a user