From 94af5d38b3d952482f936424d1a8b1113ddabba3dbeabae309bf520064ed4cbd Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Tue, 15 Dec 2020 16:10:42 +0000 Subject: [PATCH 1/4] revert adding xen in all arch, its x86_64 only OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=50 --- JeOS.kiwi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JeOS.kiwi b/JeOS.kiwi index ead2d83..b18072f 100644 --- a/JeOS.kiwi +++ b/JeOS.kiwi @@ -316,8 +316,8 @@ - - + + From d9475e9ef8b52978cf391bd546a1d5d83cf48c4c36d7412cc01be111e3cd5529 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 16 Dec 2020 09:48:38 +0000 Subject: [PATCH 2/4] Revert change without review OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=51 --- JeOS.kiwi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JeOS.kiwi b/JeOS.kiwi index b18072f..ead2d83 100644 --- a/JeOS.kiwi +++ b/JeOS.kiwi @@ -316,8 +316,8 @@ - - + + From 21b3c03ccb96e3253ae6e373c013bed7c957d4460947e6513eda2996fec95602 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Jan 2021 13:07:06 +0000 Subject: [PATCH 3/4] - Drop /etc/shadow modification in config.sh, fixed in system-user-root meanwhile - Avoid bare *** in config.sh OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=52 --- config.sh | 5 ++--- kiwi-templates-JeOS.changes | 7 +++++++ kiwi-templates-JeOS.spec | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config.sh b/config.sh index 854309c..7c283db 100644 --- a/config.sh +++ b/config.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -41,8 +41,7 @@ echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf #====================================== # prepare for setting root pw, timezone #-------------------------------------- -echo ** "reset machine settings" -sed -i 's/^root:[^:]*:/root:*:/' /etc/shadow +echo "reset machine settings" rm -f /etc/machine-id \ /var/lib/zypp/AnonymousUniqueId \ /var/lib/systemd/random-seed \ diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 88ebdda..7344cb2 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 19 13:05:39 UTC 2021 - Fabian Vogt + +- Drop /etc/shadow modification in config.sh, fixed in system-user-root + meanwhile +- Avoid bare *** in config.sh + ------------------------------------------------------------------- Wed Dec 2 14:28:44 UTC 2020 - Guillaume GARDET diff --git a/kiwi-templates-JeOS.spec b/kiwi-templates-JeOS.spec index 36b8d4d..de224cd 100644 --- a/kiwi-templates-JeOS.spec +++ b/kiwi-templates-JeOS.spec @@ -1,7 +1,7 @@ # # spec file for package kiwi-templates-JeOS # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 825dbb04aa74a422d485a0a25c4632061e931f2feadeb30e9ef60ec488602330 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Jan 2021 13:12:43 +0000 Subject: [PATCH 4/4] **, not *** OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=53 --- config.sh | 2 +- kiwi-templates-JeOS.changes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 7c283db..251c5c9 100644 --- a/config.sh +++ b/config.sh @@ -41,7 +41,7 @@ echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf #====================================== # prepare for setting root pw, timezone #-------------------------------------- -echo "reset machine settings" +echo "** reset machine settings" rm -f /etc/machine-id \ /var/lib/zypp/AnonymousUniqueId \ /var/lib/systemd/random-seed \ diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 7344cb2..da12e39 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -3,7 +3,7 @@ Tue Jan 19 13:05:39 UTC 2021 - Fabian Vogt - Drop /etc/shadow modification in config.sh, fixed in system-user-root meanwhile -- Avoid bare *** in config.sh +- Fix bare *** in config.sh ------------------------------------------------------------------- Wed Dec 2 14:28:44 UTC 2020 - Guillaume GARDET