rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove duplicate ACLs in %post

Browse Source 
This fixes a problem added during development, so it should be enough
to carry the scriplet for some time and remove it in all branches before
F22 goes stable.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-03 13:59:56 -05:00
parent e4a83a82af
commit b081c530a5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd.spec
View File

@ -496,6 +496,10 @@ chmod g+s /run/log/journal/ /run/log/journal/`cat /etc/machine-id 2> /dev/null`
# Apply ACL to the journal directory # Apply ACL to the journal directory
setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ >/dev/null 2>&1 || : setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ >/dev/null 2>&1 || :
# Remove duplicate ACL entries on /var/log/journal/<id>
# This should be removed before before F22 or F23 release
getfacl -p /var/log/journal/`cat /etc/machine-id`|grep -v '^#'|sort -u|setfacl --set-file=- /var/log/journal/`cat /etc/machine-id` >/dev/null 2>&1 || :
# Move old stuff around in /var/lib # Move old stuff around in /var/lib
mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/random-seed >/dev/null 2>&1 || : mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/random-seed >/dev/null 2>&1 || :
mv %{_localstatedir}/lib/backlight %{_localstatedir}/lib/systemd/backlight >/dev/null 2>&1 || : mv %{_localstatedir}/lib/backlight %{_localstatedir}/lib/systemd/backlight >/dev/null 2>&1 || :
@ -885,7 +889,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%changelog %changelog
* Tue Mar 3 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 219-8 * Tue Mar 3 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 219-8
- Reworked device handling (#1195761) - Reworked device handling (#1195761)
- ACL handling fixes - ACL handling fixes (with a script in %%post)
- Various log messages downgraded (#1184712) - Various log messages downgraded (#1184712)
* Wed Feb 25 2015 Michal Schmidt <mschmidt@redhat.com> - 219-7 * Wed Feb 25 2015 Michal Schmidt <mschmidt@redhat.com> - 219-7