From 076fa4f4734b5dccf8964fb16d443da3fdc3df2b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 8 Dec 2022 04:12:25 +0000 Subject: [PATCH] import osbuild-composer-69-1.el8 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- SPECS/osbuild-composer.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a1b3a4c..6f76266 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-68.tar.gz +SOURCES/osbuild-composer-69.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index fae50c0..28a5a17 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -da3dd4a5b7d18798d926b4bb1e1d627f6069f14a SOURCES/osbuild-composer-68.tar.gz +c644ce7f5fec39f8263dde143a103d2da450152e SOURCES/osbuild-composer-69.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index bac5d9d..37c0675 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 68 +Version: 69 %gometa @@ -326,8 +326,9 @@ The worker for osbuild-composer %preun worker # systemd_preun uses systemctl disable --now which doesn't work well with template services. # See https://github.com/systemd/systemd/issues/15620 -# The following lines mimicks its behaviour by running two commands: -if [ -d /run/systemd/system ]; then +# The following lines mimicks its behaviour by running two commands. +# The scriptlet is supposed to run only when the package is being removed. +if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then # disable and stop all the worker services systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" @@ -427,6 +428,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Nov 30 2022 imagebuilder-bot - 69-1 +- New upstream release + * Wed Nov 16 2022 imagebuilder-bot - 68-1 - New upstream release