pool/netcfg
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 236841 from Base:System

Browse Source 
- move /etc/HOSTNAME to /etc/hostname during update

- HOSTNAME renamed to hostname [bnc#858908]

OBS-URL: https://build.opensuse.org/request/show/236841
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcfg?expand=0&rev=29
This commit is contained in:
Stephan Kulow 2014-06-18 08:59:28 +00:00 committed by Git OBS Bridge
commit 36cda3eff8
3 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
HOSTNAME → hostname
View File

10
netcfg.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 11 08:47:56 UTC 2014 - pgajdos@suse.com
- move /etc/HOSTNAME to /etc/hostname during update
-------------------------------------------------------------------
Wed Jun 4 10:36:22 UTC 2014 - pgajdos@suse.com
- HOSTNAME renamed to hostname [bnc#858908]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 6 16:30:09 UTC 2014 - pgajdos@suse.com Thu Feb 6 16:30:09 UTC 2014 - pgajdos@suse.com

87
netcfg.spec
View File

@ -17,14 +17,11 @@
Name: netcfg Name: netcfg
PreReq: coreutils aaa_base Version: 11.5
Release: 0
Summary: Network Configuration Files in /etc Summary: Network Configuration Files in /etc
License: BSD-3-Clause License: BSD-3-Clause
Group: System/Base Group: System/Base
Version: 11.5
Release: 0
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: defaultdomain Source0: defaultdomain
Source1: exports Source1: exports
Source2: ftpusers Source2: ftpusers
@ -37,7 +34,7 @@ Source8: hosts.lpd
Source9: networks Source9: networks
Source10: protocols Source10: protocols
Source11: services.bz2 Source11: services.bz2
Source12: HOSTNAME Source12: hostname
Source13: aliases Source13: aliases
Source14: ethers Source14: ethers
Source15: netgroup Source15: netgroup
@ -46,39 +43,58 @@ Source100: services-compare.pl
Source101: services-compare.sh Source101: services-compare.sh
Source102: services-create.pl Source102: services-create.pl
Source103: services_UPDATING Source103: services_UPDATING
Patch: services-suse.diff Patch0: services-suse.diff
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: aaa_base
PreReq: coreutils
PreReq: permissions
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
All of the basic configuration files for the network programs including All of the basic configuration files for the network programs including
/etc/aliases, /etc/protocols, and /etc/services. %{_sysconfdir}/aliases, %{_sysconfdir}/protocols, and %{_sysconfdir}/services.
These are often used by network routines in the C library and therefore These are often used by network routines in the C library and therefore
must be installed for all network programs. must be installed for all network programs.
%prep %prep
%build %build
cp %{S:16} . cp %{SOURCE16} .
%install %install
mkdir -p $RPM_BUILD_ROOT/etc mkdir -p %{buildroot}/etc
for i in HOSTNAME aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do
install $RPM_SOURCE_DIR/$i $RPM_BUILD_ROOT/etc install $RPM_SOURCE_DIR/$i %{buildroot}/etc
done done
bunzip2 $RPM_BUILD_ROOT/etc/services.bz2 bunzip2 %{buildroot}%{_sysconfdir}/services.bz2
patch -p0 $RPM_BUILD_ROOT/etc/services < $RPM_SOURCE_DIR/services-suse.diff patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff
rm -f $RPM_BUILD_ROOT/etc/services.orig rm -f %{buildroot}%{_sysconfdir}/services.orig
ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME
%pre %pre
if [ "0$1" -ge "2" ]; then if [ "0$1" -ge "2" ]; then
# If we have a /etc/netgroup.rpmsave and no /etc/netgroup, copy # If we have a /etc/netgroup.rpmsave and no /etc/netgroup, copy
# /etc/netgroup.rpmsave and use it later instead of the new one. # /etc/netgroup.rpmsave and use it later instead of the new one.
if [ -f /etc/netgroup.rpmsave -a ! -e /etc/netgroup ]; then if [ -f %{_sysconfdir}/netgroup.rpmsave -a ! -e %{_sysconfdir}/netgroup ]; then
cp /etc/netgroup.rpmsave /etc/...netgroup.new.rpmnew cp %{_sysconfdir}/netgroup.rpmsave %{_sysconfdir}/...netgroup.new.rpmnew
fi fi
fi fi
#/etc/HOSTNAME renamed to /etc/hostname [bnc#858908]
#On Tue, Jun 10, 2014 at 03:23:00PM +0200, Frederic Crozat wrote:
#> So, it means netcfg should have a %pre which check if /etc/HOSTNAME is a
#> filename (and not a symlink) and in that case, rename the file
#> to /etc/hostname. This should ensure /etc/HOSTNAME is properly created
#> by RPM.
if [ "0$1" -ge "2" ]; then
if [ -f /etc/HOSTNAME -a ! -h /etc/HOSTNAME ]; then
if [ -f /etc/hostname ]; then
mv /etc/hostname /etc/hostname.rpmsave
fi
mv /etc/HOSTNAME /etc/hostname
fi
fi
%post %post
test -f etc/defaultdomain.rpmnew -a ! -s etc/defaultdomain.rpmnew && rm -f etc/defaultdomain.rpmnew test -f etc/defaultdomain.rpmnew -a ! -s etc/defaultdomain.rpmnew && rm -f etc/defaultdomain.rpmnew
@ -90,22 +106,23 @@ exit 0
%files %files
%defattr(644,root,root,755) %defattr(644,root,root,755)
%verify(not md5 size mtime) %config(noreplace) /etc/HOSTNAME %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname
%verify(not md5 size mtime) %config(noreplace) /etc/aliases /etc/HOSTNAME
%verify(not md5 size mtime) %config(noreplace) /etc/defaultdomain %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases
%verify(not md5 size mtime) %config(noreplace) /etc/ethers %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain
%verify(not md5 size mtime) %config(noreplace) /etc/exports %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers
%verify(not md5 size mtime) %config(noreplace) /etc/ftpusers %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/exports
%config(noreplace) /etc/host.conf %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ftpusers
%verify(not md5 size mtime) %config(noreplace) /etc/hosts %config(noreplace) %{_sysconfdir}/host.conf
%verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts
%verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.allow
%verify(not md5 size mtime) %config(noreplace) /etc/hosts.equiv %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.deny
%verify(not md5 size mtime) %config(noreplace) /etc/hosts.lpd %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.equiv
%config(noreplace) /etc/netgroup %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.lpd
%config(noreplace) /etc/networks %config(noreplace) %{_sysconfdir}/netgroup
%config(noreplace) /etc/protocols %config(noreplace) %{_sysconfdir}/networks
%config(noreplace) /etc/services %config(noreplace) %{_sysconfdir}/protocols
%config(noreplace) %{_sysconfdir}/services
%doc COPYING %doc COPYING
%changelog %changelog