From 522c2779450fd8ca0677da84dd6b857cd98131c3c0bc41ab742a47bfb42e6b38 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 19 Mar 2024 14:11:27 +0000
Subject: [PATCH] Accepting request 1159575 from
 home:daandemeyer:branches:Base:System

- Account for upstream changes to the quotaon and quotacheck services

OBS-URL: https://build.opensuse.org/request/show/1159575
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1503
---
 files.systemd   | 8 ++++++++
 files.udev      | 8 ++++++++
 systemd.changes | 5 +++++
 3 files changed, 21 insertions(+)

diff --git a/files.systemd b/files.systemd
index 7181ec45..8c454370 100644
--- a/files.systemd
+++ b/files.systemd
@@ -536,7 +536,15 @@
 %{_unitdir}/printer.target
 %{_unitdir}/proc-sys-fs-binfmt_misc.automount
 %{_unitdir}/proc-sys-fs-binfmt_misc.mount
+%if %{with upstream}
+%{_unitdir}/quotaon-root.service
+%endif
+%if %{without upstream}
 %{_unitdir}/quotaon.service
+%endif
+%if %{with upstream}
+%{_unitdir}/quotaon@.service
+%endif
 %{_unitdir}/reboot.target
 %{_unitdir}/remote-fs-pre.target
 %{_unitdir}/remote-fs.target
diff --git a/files.udev b/files.udev
index e40877a5..7e42309c 100644
--- a/files.udev
+++ b/files.udev
@@ -330,7 +330,15 @@
 %endif
 %{_unitdir}/systemd-network-generator.service
 %{_unitdir}/systemd-pstore.service
+%if %{with upstream}
+%{_unitdir}/systemd-quotacheck-root.service
+%endif
+%if %{without upstream}
 %{_unitdir}/systemd-quotacheck.service
+%endif
+%if %{with upstream}
+%{_unitdir}/systemd-quotacheck@.service
+%endif
 %{_unitdir}/systemd-random-seed.service
 %{_unitdir}/systemd-remount-fs.service
 %{_unitdir}/systemd-rfkill.service
diff --git a/systemd.changes b/systemd.changes
index 9abafc65..854c9d61 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -13,6 +13,11 @@ Mon Mar 18 19:18:33 UTC 2024 - Franck Bui <fbui@suse.com>
 
   3986ed5117 test: drop route from test-functions
 
+-------------------------------------------------------------------
+Mon Mar 18 15:30:26 UTC 2024 - Daan De Meyer <daan.j.demeyer@gmail.com>
+
+- Account for upstream changes to the quotaon and quotacheck services
+
 -------------------------------------------------------------------
 Mon Mar 18 11:32:09 UTC 2024 - Michal Vyskocil <mvyskocil@opensuse.org>