dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)

Browse Source 
- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)

Now with more whitespace and readlink -f.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1110
This commit is contained in:
Franck Bui 2020-08-28 10:41:59 +00:00 committed by Git OBS Bridge
parent 76f47d96b4
commit c74b1a000c
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)
-------------------------------------------------------------------
Wed Aug 26 09:46:46 UTC 2020 - Franck Bui <fbui@suse.com>

13
systemd-mini.spec
View File

@ -786,12 +786,6 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
# a %pre that needs to be run during the build. systemd is one of them
# so keep the section even if it's empty.
%pre
if [ $1 -gt 1 ] ; then
case "$(systemctl show -pFragmentPath tmp.mount)" in
FragmentPath=/usr/lib/systemd/system/tmp.mount)
ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
esac
fi
%post
# Make /etc/machine-id an empty file during package installation. On
@ -869,6 +863,13 @@ fi
# It's run only once.
%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || :
# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount.
# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore,
# so migrate the link to the new location.
if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then
ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount
fi
%postun
%systemd_postun
# Avoid restarting logind until fixed upstream (issue #1163)

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779)
-------------------------------------------------------------------
Wed Aug 26 09:46:46 UTC 2020 - Franck Bui <fbui@suse.com>

13
systemd.spec
View File

@ -784,12 +784,6 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
# a %pre that needs to be run during the build. systemd is one of them
# so keep the section even if it's empty.
%pre
if [ $1 -gt 1 ] ; then
case "$(systemctl show -pFragmentPath tmp.mount)" in
FragmentPath=/usr/lib/systemd/system/tmp.mount)
ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
esac
fi
%post
# Make /etc/machine-id an empty file during package installation. On
@ -867,6 +861,13 @@ fi
# It's run only once.
%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || :
# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount.
# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore,
# so migrate the link to the new location.
if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then
ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount
fi
%postun
%systemd_postun
# Avoid restarting logind until fixed upstream (issue #1163)