Resolves:rh:#825261: redhat-lsb scripts blow away my /etc/nsswitch.conf
This commit is contained in:
parent
adeb067197
commit
d9bd2fe6ce
|
@ -43,7 +43,7 @@
|
||||||
Summary: Implementation of Linux Standard Base specification
|
Summary: Implementation of Linux Standard Base specification
|
||||||
Name: redhat-lsb
|
Name: redhat-lsb
|
||||||
Version: 4.1
|
Version: 4.1
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
|
URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
|
||||||
Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2
|
Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2
|
||||||
Patch0: lsb-release-3.1-update-init-functions.patch
|
Patch0: lsb-release-3.1-update-init-functions.patch
|
||||||
|
@ -273,7 +273,7 @@ Requires: redhat-lsb-submod-security%{?_isa} = %{version}
|
||||||
|
|
||||||
Provides: lsb-core-%{archname} = %{version}
|
Provides: lsb-core-%{archname} = %{version}
|
||||||
Provides: lsb-core-noarch = %{version}
|
Provides: lsb-core-noarch = %{version}
|
||||||
Obsoletes: redhat-lsb < %{version}
|
#Obsoletes: redhat-lsb < %{version}
|
||||||
|
|
||||||
%description core
|
%description core
|
||||||
The Linux Standard Base (LSB) Core module support provides the fundamental
|
The Linux Standard Base (LSB) Core module support provides the fundamental
|
||||||
|
@ -570,15 +570,14 @@ fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
if grep '^hosts: \+files \+dns$' /etc/nsswitch.conf;then
|
if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
|
||||||
true
|
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
|
||||||
else
|
|
||||||
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.bak
|
|
||||||
ed -s /etc/nsswitch.conf <<EOF
|
ed -s /etc/nsswitch.conf <<EOF
|
||||||
/^hosts: \+files \+/s/.*/hosts: files dns/
|
/^hosts: \+files \+/s/.*/hosts: files dns/
|
||||||
w
|
w
|
||||||
q
|
q
|
||||||
EOF
|
EOF
|
||||||
|
cat /etc/nsswitch.conf > %{_datadir}/lsb/nsswitch.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
@ -590,21 +589,25 @@ fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
if grep '^hosts: \+files \+dns$' /etc/nsswitch.conf;then
|
if ! grep -s -q '^hosts: \+files \+dns *$' /etc/nsswitch.conf;then
|
||||||
true
|
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.orig
|
||||||
else
|
ed -s /etc/nsswitch.conf <<EOF
|
||||||
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf.bak
|
|
||||||
ed -s /etc/nsswitch.conf <<EOF
|
|
||||||
/^hosts: \+files \+/s/.*/hosts: files dns/
|
/^hosts: \+files \+/s/.*/hosts: files dns/
|
||||||
w
|
w
|
||||||
q
|
q
|
||||||
EOF
|
EOF
|
||||||
|
cat /etc/nsswitch.conf >%{_datadir}/lsb/nsswitch.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
cat %{_datadir}/lsb/nsswitch.conf.bak >/etc/nsswitch.conf
|
if [ $1 -eq 0 ];then
|
||||||
rm -f %{_datadir}/lsb/nsswitch.conf.bak
|
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
|
||||||
|
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>
|
%postun submod-security -p <lua>
|
||||||
os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules")
|
os.remove("%{_datadir}/lsb/%{lsbrelver}/submodules")
|
||||||
|
@ -720,6 +723,9 @@ os.remove("%{_datadir}/lsb")
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 29 2012 xning <xning AT redhat DOT com> - 4.1-4
|
||||||
|
- Resolves:rh:#825261: redhat-lsb scripts blow away my /etc/nsswitch.conf
|
||||||
|
|
||||||
* Wed May 23 2012 Parag <pnemade AT redhat DOT com> - 4.1-3
|
* Wed May 23 2012 Parag <pnemade AT redhat DOT com> - 4.1-3
|
||||||
- Resolves:rh#824305: Dependency glibc-common%{?_isa} should be changed to glibc-common only
|
- Resolves:rh#824305: Dependency glibc-common%{?_isa} should be changed to glibc-common only
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue