From 83343508eead857cafd873fbf4caffb6de44b6ea4cb44a73db348e13a5c8b44e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Oct 2021 09:47:55 +0000 Subject: [PATCH] Accepting request 926004 from home:favogt:branches:Virtualization:Appliances:Images:openSUSE-Tumbleweed - Don't delete /etc/machine-id (see gh#OSInside/kiwi#1650) - Also don't delete the dbus machine-id, it's a symlink OBS-URL: https://build.opensuse.org/request/show/926004 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=64 --- config.sh | 6 ++---- kiwi-templates-JeOS.changes | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config.sh b/config.sh index 251c5c9..5ec449b 100644 --- a/config.sh +++ b/config.sh @@ -42,10 +42,8 @@ echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf # prepare for setting root pw, timezone #-------------------------------------- echo "** reset machine settings" -rm -f /etc/machine-id \ - /var/lib/zypp/AnonymousUniqueId \ - /var/lib/systemd/random-seed \ - /var/lib/dbus/machine-id +rm -f /var/lib/zypp/AnonymousUniqueId \ + /var/lib/systemd/random-seed #====================================== # Specify default systemd target diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 5695460..f7ac81f 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 18 11:20:51 UTC 2021 - Fabian Vogt + +- Don't delete /etc/machine-id (see gh#OSInside/kiwi#1650) +- Also don't delete the dbus machine-id, it's a symlink + ------------------------------------------------------------------- Wed Apr 7 13:19:01 UTC 2021 - Fabian Vogt