From 549d330fc6dd2e127e7958b8463a69eeba29fbb31b5ae21ec9722e7ee5417d85 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 1 Feb 2025 17:49:33 +0000 Subject: [PATCH] - Create and own directories /etc/blkid.conf.d and /usr/etc/blkid.conf.d (boo#1235887#c3). - Add missingok for /etc/blkid.conf. OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=585 --- util-linux.changes | 7 +++++++ util-linux.spec | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index ebecd9d..f5fbd35 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 28 23:05:38 UTC 2025 - Stanislav Brabec + +- Create and own directories /etc/blkid.conf.d and + /usr/etc/blkid.conf.d (boo#1235887#c3). +- Add missingok for /etc/blkid.conf. + ------------------------------------------------------------------- Mon Jan 20 18:12:46 UTC 2025 - Stanislav Brabec diff --git a/util-linux.spec b/util-linux.spec index a183a9a..70e4452 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -616,6 +616,7 @@ fi mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d} install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf touch %{buildroot}%{_sysconfdir}/blkid.conf +mkdir %{buildroot}%{_sysconfdir}/blkid.conf.d %{buildroot}%{_distconfdir}/blkid.conf.d install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote %if 0%{?suse_version} <= 1500 @@ -978,7 +979,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : # defined no_config %config %dir %{_sysconfdir}/issue.d - %if %{ul_extra_bin_sbin} %core /bin/kill %core %verify(not mode) %attr(%ul_suid,root,root) /bin/su @@ -1367,9 +1367,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %license README.licensing %license COPYING %license Documentation/licenses/* -%ghost %config %{_sysconfdir}/blkid.conf +%ghost %config(missingok) %{_sysconfdir}/blkid.conf +%config %dir %{_sysconfdir}/blkid.conf.d %{_distconfdir}/blkid.conf - +%dir %{_distconfdir}/blkid.conf.d %{_datadir}/bash-completion/completions/* %exclude %{_datadir}/bash-completion/completions/findmnt %exclude %{_datadir}/bash-completion/completions/logger @@ -1395,10 +1396,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : ################# %if "%ulsubset" == "systemd" %exclude %{_distconfdir}/blkid.conf -%exclude %{_sysconfdir}/blkid.conf - +%exclude %dir %{_distconfdir}/blkid.conf.d +%exclude %config(missingok) %{_sysconfdir}/blkid.conf +%exclude %config %{_sysconfdir}/blkid.conf.d %exclude %config %dir %{_sysconfdir}/issue.d - %if %{ul_extra_bin_sbin} /bin/findmnt /bin/logger