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

Accepting request 635278 from home:kukuk:branches:Base:System

Browse Source 
- Don't create /etc/HOSTNAME symlink anymore, the expected content
  is slightly different from /etc/hostname [bsc#972463]

OBS-URL: https://build.opensuse.org/request/show/635278
OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=58
This commit is contained in:
Tomáš Chvátal 2018-09-12 11:00:51 +00:00 committed by Git OBS Bridge
parent 5ac08c61cf
commit f6fb114c35
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netcfg.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 12 08:18:06 UTC 2018 - Thorsten Kukuk <kukuk@suse.de>
- Don't create /etc/HOSTNAME symlink anymore, the expected content
is slightly different from /etc/hostname [bsc#972463]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 2 09:40:31 UTC 2018 - tchvatal@suse.com Mon Jul 2 09:40:31 UTC 2018 - tchvatal@suse.com

5
netcfg.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -70,7 +70,6 @@ done
bunzip2 %{buildroot}%{_sysconfdir}/services.bz2 bunzip2 %{buildroot}%{_sysconfdir}/services.bz2
patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff
rm -f %{buildroot}%{_sysconfdir}/services.orig rm -f %{buildroot}%{_sysconfdir}/services.orig
ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME
%pre %pre
# HOSTNAME migration supported scenarios [bnc#858908]: # HOSTNAME migration supported scenarios [bnc#858908]:
@ -83,7 +82,6 @@ if [ $1 -gt 1 ]; then
cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave
rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname
touch %{_sysconfdir}/hostname touch %{_sysconfdir}/hostname
ln -s %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME
fi fi
fi fi
exit 0 exit 0
@ -103,7 +101,6 @@ exit 0
%files %files
%defattr(644,root,root,755) %defattr(644,root,root,755)
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname
%{_sysconfdir}/HOSTNAME
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers