From 21b3c03ccb96e3253ae6e373c013bed7c957d4460947e6513eda2996fec95602 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Jan 2021 13:07:06 +0000 Subject: [PATCH] - 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