From 0219bf791bc0d6ba9a24e13b8b43176be89cad553fa15322d6685850c949c95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 11 Jun 2015 15:38:02 +0000 Subject: [PATCH 1/3] - Keep /etc/hostname empty and %ghost it. bnc#934056 OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=41 --- hostname | 1 - netcfg.changes | 5 +++++ netcfg.spec | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hostname b/hostname index 0d0f6b4..473a0f4 100644 --- a/hostname +++ b/hostname @@ -1 +0,0 @@ -linux.site diff --git a/netcfg.changes b/netcfg.changes index 087a7f9..d480b31 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 11 15:37:35 UTC 2015 - tchvatal@suse.com + +- Keep /etc/hostname empty and %ghost it. bnc#934056 + ------------------------------------------------------------------- Wed Dec 17 10:32:15 UTC 2014 - tchvatal@suse.com diff --git a/netcfg.spec b/netcfg.spec index 8e013b4..83d1565 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -101,7 +101,7 @@ exit 0 %files %defattr(644,root,root,755) -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname +%ghost %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain From 76f5130838c65f827e24bf7abe24cb009ce2376d492596eb79a788f4bb8dfa6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Aug 2015 07:47:42 +0000 Subject: [PATCH 2/3] - Do not ghost the empty /etc/hostname to not break installationimages pkg. OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=42 --- netcfg.changes | 6 ++++++ netcfg.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/netcfg.changes b/netcfg.changes index d480b31..4774c2f 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 4 07:47:22 UTC 2015 - tchvatal@suse.com + +- Do not ghost the empty /etc/hostname to not break installationimages + pkg. + ------------------------------------------------------------------- Thu Jun 11 15:37:35 UTC 2015 - tchvatal@suse.com diff --git a/netcfg.spec b/netcfg.spec index 83d1565..ef572ee 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -101,7 +101,7 @@ exit 0 %files %defattr(644,root,root,755) -%ghost %{_sysconfdir}/hostname +%{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain From 007a74db68680f39cfad2bb9ab34bde72299ca0a7045a8d200f6fa88d3d7109d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Aug 2015 07:57:44 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=43 --- netcfg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netcfg.spec b/netcfg.spec index ef572ee..3d8b0cc 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -101,7 +101,7 @@ exit 0 %files %defattr(644,root,root,755) -%{_sysconfdir}/hostname +%config %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain