Simplify creation of /etc/mtab symlink
It was created unconditionally in %post, so the original contents (if any) were overwritten. Listing is as %config was just misleading. Let's simply list the symlink as normal contents in the rpm, so that rpm can install the symlink for us. (The scriplet was missing a dependency on coreutils for ln, but let's not add that if we can drop the whole thing.) [kzak@redhat.com: - add %changelog entry]
This commit is contained in:
parent
6578411a87
commit
6c5649c0b6
@ -2,7 +2,7 @@
|
|||||||
Summary: Collection of basic system utilities
|
Summary: Collection of basic system utilities
|
||||||
Name: util-linux
|
Name: util-linux
|
||||||
Version: 2.38
|
Version: 2.38
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||||
URL: https://en.wikipedia.org/wiki/Util-linux
|
URL: https://en.wikipedia.org/wiki/Util-linux
|
||||||
|
|
||||||
@ -429,11 +429,6 @@ find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
|||||||
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
||||||
|
|
||||||
|
|
||||||
%post -n util-linux-core
|
|
||||||
if [ ! -L /etc/mtab ]; then
|
|
||||||
ln -sf ../proc/self/mounts /etc/mtab || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%pre -n uuidd
|
%pre -n uuidd
|
||||||
getent group uuidd >/dev/null || groupadd -r uuidd
|
getent group uuidd >/dev/null || groupadd -r uuidd
|
||||||
getent passwd uuidd >/dev/null || \
|
getent passwd uuidd >/dev/null || \
|
||||||
@ -736,7 +731,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%files -n util-linux-core
|
%files -n util-linux-core
|
||||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
|
|
||||||
%attr(4755,root,root) %{_bindir}/mount
|
%attr(4755,root,root) %{_bindir}/mount
|
||||||
%attr(4755,root,root) %{_bindir}/umount
|
%attr(4755,root,root) %{_bindir}/umount
|
||||||
%{_bindir}/chrt
|
%{_bindir}/chrt
|
||||||
@ -822,6 +816,7 @@ fi
|
|||||||
%{_sbindir}/swapoff
|
%{_sbindir}/swapoff
|
||||||
%{_sbindir}/swapon
|
%{_sbindir}/swapon
|
||||||
%{_sbindir}/switch_root
|
%{_sbindir}/switch_root
|
||||||
|
/etc/mtab
|
||||||
|
|
||||||
|
|
||||||
%files -n util-linux-user
|
%files -n util-linux-user
|
||||||
@ -914,6 +909,9 @@ fi
|
|||||||
%{_libdir}/python*/site-packages/libmount/
|
%{_libdir}/python*/site-packages/libmount/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 30 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-2
|
||||||
|
- simplify creation of /etc/mtab symlink
|
||||||
|
|
||||||
* Wed Mar 30 2022 Karel Zak <kzak@redhat.com> - 2.38-1
|
* Wed Mar 30 2022 Karel Zak <kzak@redhat.com> - 2.38-1
|
||||||
- upgrade to v2.38
|
- upgrade to v2.38
|
||||||
- don't (re)generate build-system
|
- don't (re)generate build-system
|
||||||
|
Loading…
Reference in New Issue
Block a user