From d86f2d4ef1ae8a45f851b7de664949fe400a9d678dff4ea3c6a862df5c135ae7 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 10 Mar 2021 09:10:55 +0000 Subject: [PATCH] - fix-machines-btrfs-subvol.sh is only shipped when machined is built OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1138 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 ++ systemd.changes | 5 +++++ systemd.spec | 2 ++ 4 files changed, 14 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index d9c20bad..57800dc1 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 10 09:10:03 UTC 2021 - Franck Bui + +- fix-machines-btrfs-subvol.sh is only shipped when machined is built + ------------------------------------------------------------------- Mon Feb 22 20:20:43 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3ced7752..77bd8f50 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -921,6 +921,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf +%if %{with machined} if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -939,6 +940,7 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%endif %if ! 0%{?bootstrap} %post logger diff --git a/systemd.changes b/systemd.changes index d9c20bad..57800dc1 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 10 09:10:03 UTC 2021 - Franck Bui + +- fix-machines-btrfs-subvol.sh is only shipped when machined is built + ------------------------------------------------------------------- Mon Feb 22 20:20:43 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 44651538..41bd4223 100644 --- a/systemd.spec +++ b/systemd.spec @@ -919,6 +919,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf +%if %{with machined} if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -937,6 +938,7 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%endif %if ! 0%{?bootstrap} %post logger