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

Version 246.1

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-08-07 17:27:02 +02:00
parent 0eabb3de75
commit c8f86d89ba
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
SHA512 (systemd-246.tar.gz) = 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f SHA512 (systemd-246.1.tar.gz) = 76a4236343237be9f647e11df71524d39222bbb2e2de03594982eb1c17547c846a77d18f129b01eeab9afe734900b3b4a7f050ba1eec7f3448bbcd21677d4e45

20
systemd.spec
View File

@ -1,7 +1,7 @@
#global commit 7f56c26d1041e686efa72b339250a98fb6ee8f00 #global commit 7f56c26d1041e686efa72b339250a98fb6ee8f00
%{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})}
#global stable 1 %global stable 1
# We ship a .pc file but don't want to have a dep on pkg-config. We # We ship a .pc file but don't want to have a dep on pkg-config. We
# strip the automatically generated dep here and instead co-own the # strip the automatically generated dep here and instead co-own the
@ -19,7 +19,7 @@
Name: systemd Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 246 Version: 246.1
Release: 1%{?dist} Release: 1%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
@ -627,12 +627,13 @@ fi
# This is for upgrades from previous versions before systemd-resolved became the default. # This is for upgrades from previous versions before systemd-resolved became the default.
systemctl --no-reload preset systemd-resolved.service &>/dev/null || : systemctl --no-reload preset systemd-resolved.service &>/dev/null || :
grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \ %triggerun -- systemd < 246.1-1
echo -e '/etc/resolv.conf was generated by NetworkManager.\nConsider removing it to let systemd-resolved manage this file.' \
|| :
if systemctl is-enabled systemd-resolved.service &>/dev/null; then if systemctl is-enabled systemd-resolved.service &>/dev/null; then
systemctl start systemd-resolved.service &>/dev/null; grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \
echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \
mv -v /etc/resolv.conf /etc/resolv.conf.orig-with-nm || :
systemctl start systemd-resolved.service &>/dev/null || :
fi fi
%post libs %post libs
@ -788,6 +789,11 @@ fi
%files tests -f .file-list-tests %files tests -f .file-list-tests
%changelog %changelog
* Fri Aug 7 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 246.1-1
- A few minor bugfixes
- Remove /etc/resolv.conf on upgrades (if managed by NetworkManager), so
that systemd-resolved can take over the management of the symlink.
* Thu Jul 30 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 246-1 * Thu Jul 30 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 246-1
- Update to released version. Only some minor bugfixes since the pre-release. - Update to released version. Only some minor bugfixes since the pre-release.