From cc0535be822d1d04bfcbc8c47f3e5bf1c625dceb Mon Sep 17 00:00:00 2001 From: duyiwei Date: Thu, 15 Aug 2024 14:38:24 +0800 Subject: [PATCH] Repair the warning that the user and group do not exist during installation --- ... => 0002-modify-cincinnati-url-for-nestos.patch | 0 rust-zincati.spec | 14 ++++++++++++-- zincati-systemd-sysusers.conf | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) rename 0001-modify-cincinnati-url-for-nestos.patch => 0002-modify-cincinnati-url-for-nestos.patch (100%) create mode 100644 zincati-systemd-sysusers.conf diff --git a/0001-modify-cincinnati-url-for-nestos.patch b/0002-modify-cincinnati-url-for-nestos.patch similarity index 100% rename from 0001-modify-cincinnati-url-for-nestos.patch rename to 0002-modify-cincinnati-url-for-nestos.patch diff --git a/rust-zincati.spec b/rust-zincati.spec index bf8c1de..9c04062 100644 --- a/rust-zincati.spec +++ b/rust-zincati.spec @@ -1,17 +1,19 @@ %bcond_without check %global __cargo_skip_build 0 %global crate zincati +%global zcuid 986 Name: rust-%{crate} Version: 0.0.27 -Release: 1 +Release: 2 Summary: Update agent for NestOS License: Apache-2.0 URL: https://crates.io/crates/%{crate} Source0: %{crate}-%{version}.crate Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz +Source2: zincati-systemd-sysusers.conf Patch1: 0001-modify-as-nestos-stream.patch -Patch2: 0001-modify-cincinnati-url-for-nestos.patch +Patch2: 0002-modify-cincinnati-url-for-nestos.patch BuildRequires: rust-packaging BuildRequires: systemd openssl-devel @@ -50,6 +52,10 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %{_datadir}/polkit-1/rules.d/zincati.rules %{_datadir}/polkit-1/actions/org.coreos.zincati.* %{_datadir}/dbus-1/system.d/*.conf +%{_sysusersdir}/zincati.conf + +%pre -n %{crate} +%sysusers_create_package %{crate} %{SOURCE2} %post -n %{crate} %systemd_post zincati.service @@ -113,6 +119,7 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/polkit-1/actions \ dist/polkit-1/actions/org.coreos.zincati.* install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d \ dist/dbus-1/system.d/*.conf +install -Dpm644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/zincati.conf ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/metrics.promsock @@ -122,6 +129,9 @@ ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/ %endif %changelog +* Thu Aug 15 2024 duyiwei - 0.0.27-2 +- Repair the warning that the user and group do not exist during installation + * Mon Apr 15 2024 lijian - 0.0.27-1 - update to 0.0.27 - update all dependencies to latest versions diff --git a/zincati-systemd-sysusers.conf b/zincati-systemd-sysusers.conf new file mode 100644 index 0000000..324bf68 --- /dev/null +++ b/zincati-systemd-sysusers.conf @@ -0,0 +1 @@ +u zincati - "Zincati user for auto-updates" /run/zincati \ No newline at end of file -- Gitee