From b3c6f6b5828dfde217b89387e85536670bef4fe605175f7239c4ae85bb6d3381 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 11 Jun 2024 11:15:59 +0000 Subject: [PATCH] Accepting request 1179985 from home:varkoly:branches:systemsmanagement - Error message about 'journald.conf' (bsc#1221533) Check if journald.conf does exist. - 1.12 OBS-URL: https://build.opensuse.org/request/show/1179985 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/clone-master-clean-up?expand=0&rev=12 --- clone-master-clean-up.changes | 7 +++++++ clone-master-clean-up.sh | 5 +++-- clone-master-clean-up.spec | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/clone-master-clean-up.changes b/clone-master-clean-up.changes index 2ce7f3d..e21e260 100644 --- a/clone-master-clean-up.changes +++ b/clone-master-clean-up.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 19 06:28:29 UTC 2024 - Peter Varkoly + +- Error message about 'journald.conf' (bsc#1221533) + Check if journald.conf does exist. +- 1.12 + ------------------------------------------------------------------- Tue Feb 7 12:26:43 UTC 2023 - Peter Varkoly diff --git a/clone-master-clean-up.sh b/clone-master-clean-up.sh index d96e5b7..8fbce42 100644 --- a/clone-master-clean-up.sh +++ b/clone-master-clean-up.sh @@ -95,10 +95,11 @@ done echo 'Clearing systemd journal' pushd /etc/systemd > /dev/null -cp journald.conf journald.conf.bak +[ -e journald.conf ] && cp journald.conf journald.conf.bak echo -e '\nSystemMaxUse=1K' >> journald.conf systemctl restart systemd-journald -mv journald.conf.bak journald.conf +rm journald.conf +[ -e journald.conf.bak ] && mv journald.conf.bak journald.conf popd > /dev/null echo 'Clearing machine ID file' diff --git a/clone-master-clean-up.spec b/clone-master-clean-up.spec index 913e058..b920a9c 100644 --- a/clone-master-clean-up.spec +++ b/clone-master-clean-up.spec @@ -1,7 +1,7 @@ # # spec file for package clone-master-clean-up # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: clone-master-clean-up -Version: 1.11 +Version: 1.12 Release: 0 Summary: Tool to clean up a system for cloning preparation License: GPL-2.0-or-later