pool/util-linux
SHA256
4
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Create and own directories /etc/blkid.conf.d and

Browse Source 
/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
This commit is contained in:
Jan Engelhardt 2025-02-01 17:49:33 +00:00 committed by Git OBS Bridge
parent c0ae35c85a
commit 549d330fc6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util-linux.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 28 23:05:38 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
- 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 <sbrabec@suse.com> Mon Jan 20 18:12:46 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>

13
util-linux.spec
View File

@ -616,6 +616,7 @@ fi
mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d} mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d}
install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf
touch %{buildroot}%{_sysconfdir}/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 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
%if 0%{?suse_version} <= 1500 %if 0%{?suse_version} <= 1500
@ -978,7 +979,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
# defined no_config # defined no_config
%config %dir %{_sysconfdir}/issue.d %config %dir %{_sysconfdir}/issue.d
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
%core /bin/kill %core /bin/kill
%core %verify(not mode) %attr(%ul_suid,root,root) /bin/su %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 README.licensing
%license COPYING %license COPYING
%license Documentation/licenses/* %license Documentation/licenses/*
%ghost %config %{_sysconfdir}/blkid.conf %ghost %config(missingok) %{_sysconfdir}/blkid.conf
%config %dir %{_sysconfdir}/blkid.conf.d
%{_distconfdir}/blkid.conf %{_distconfdir}/blkid.conf
%dir %{_distconfdir}/blkid.conf.d
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%exclude %{_datadir}/bash-completion/completions/findmnt %exclude %{_datadir}/bash-completion/completions/findmnt
%exclude %{_datadir}/bash-completion/completions/logger %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" %if "%ulsubset" == "systemd"
%exclude %{_distconfdir}/blkid.conf %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 %exclude %config %dir %{_sysconfdir}/issue.d
%if %{ul_extra_bin_sbin} %if %{ul_extra_bin_sbin}
/bin/findmnt /bin/findmnt
/bin/logger /bin/logger