From f6fb114c35c074bf248802d03d19131f663c802459d126b72e5460fe7c33e09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 12 Sep 2018 11:00:51 +0000 Subject: [PATCH] Accepting request 635278 from home:kukuk:branches:Base:System - 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 --- netcfg.changes | 6 ++++++ netcfg.spec | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netcfg.changes b/netcfg.changes index 1caa98d..2cf2fbc 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 12 08:18:06 UTC 2018 - Thorsten Kukuk + +- 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 diff --git a/netcfg.spec b/netcfg.spec index 5e0fdfd..dec8bb9 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # 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 patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff rm -f %{buildroot}%{_sysconfdir}/services.orig -ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME %pre # HOSTNAME migration supported scenarios [bnc#858908]: @@ -83,7 +82,6 @@ if [ $1 -gt 1 ]; then cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname touch %{_sysconfdir}/hostname - ln -s %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME fi fi exit 0 @@ -103,7 +101,6 @@ exit 0 %files %defattr(644,root,root,755) %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}/defaultdomain %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers