sys-apps/systemd: Update to systemd v247

Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
This commit is contained in:
Sayan Chowdhury 2021-01-11 14:38:31 +05:30 committed by Sayan Chowdhury
parent 4ff2518ba3
commit f0c0fe10af
6 changed files with 52 additions and 52 deletions

View File

@ -1 +1 @@
DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82

View File

@ -4,19 +4,18 @@ Date: Tue, 2 Jun 2015 18:22:32 -0700
Subject: [PATCH 2/5] networkd: default to "kernel" IPForwarding setting Subject: [PATCH 2/5] networkd: default to "kernel" IPForwarding setting
--- ---
src/network/networkd-network.c | 2 ++ src/network/networkd-network.c | 1 +
1 file changed, 2 insertions(+) 1 file changed, 1 insertion(+)
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 97f5551ee5..d12072665a 100644 index 3254641461..4f34daa919 100644
--- a/src/network/networkd-network.c --- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c +++ b/src/network/networkd-network.c
@@ -461,6 +461,8 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi @@ -410,6 +410,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
.ipv6ll_address_gen_mode = _IPV6_LINK_LOCAL_ADDRESS_GEN_MODE_INVALID,
.ipv4_accept_local = -1, .ipv4_accept_local = -1,
+ .ip_forward = _ADDRESS_FAMILY_INVALID, + .ip_forward = _ADDRESS_FAMILY_INVALID,
+
.ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_NO, .ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_NO,
.ipv6_accept_ra = -1, .ipv6_accept_ra = -1,
.ipv6_dad_transmits = -1, .ipv6_dad_transmits = -1,

View File

@ -10,23 +10,23 @@ Updates should be triggered whenever usr changes, not only when it is newer.
2 files changed, 4 insertions(+), 4 deletions(-) 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 91196dff30..14cffbd042 100644 index 3393010ff6..5478baca25 100644
--- a/man/systemd-update-done.service.xml --- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml +++ b/man/systemd-update-done.service.xml
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<varname>ConditionNeedsUpdate=</varname> (see <varname>ConditionNeedsUpdate=</varname> (see
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>) <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
condition to make sure to run when <filename>/etc</filename> or condition to make sure to run when <filename>/etc/</filename> or
- <filename>/var</filename> are older than <filename>/usr</filename> - <filename>/var/</filename> are older than <filename>/usr/</filename>
+ <filename>/var</filename> aren't the same age as <filename>/usr</filename> + <filename>/var/</filename> aren't the same age as <filename>/usr/</filename>
according to the modification times of the files described above. according to the modification times of the files described above.
This requires that updates to <filename>/usr</filename> are always This requires that updates to <filename>/usr/</filename> are always
followed by an update of the modification time of followed by an update of the modification time of
diff --git a/src/shared/condition.c b/src/shared/condition.c diff --git a/src/shared/condition.c b/src/shared/condition.c
index bf3b5fa162..749f134328 100644 index b2ec690bc3..4cf6523b90 100644
--- a/src/shared/condition.c --- a/src/shared/condition.c
+++ b/src/shared/condition.c +++ b/src/shared/condition.c
@@ -592,7 +592,7 @@ static int condition_test_needs_update(Condition *c, char **env) { @@ -593,7 +593,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
* First, compare seconds as they are always accurate... * First, compare seconds as they are always accurate...
*/ */
if (usr.st_mtim.tv_sec != other.st_mtim.tv_sec) if (usr.st_mtim.tv_sec != other.st_mtim.tv_sec)
@ -35,7 +35,7 @@ index bf3b5fa162..749f134328 100644
/* /*
* ...then compare nanoseconds. * ...then compare nanoseconds.
@@ -603,7 +603,7 @@ static int condition_test_needs_update(Condition *c, char **env) { @@ -604,7 +604,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
* (otherwise the filesystem supports nsec timestamps, see stat(2)). * (otherwise the filesystem supports nsec timestamps, see stat(2)).
*/ */
if (usr.st_mtim.tv_nsec == 0 || other.st_mtim.tv_nsec > 0) if (usr.st_mtim.tv_nsec == 0 || other.st_mtim.tv_nsec > 0)
@ -44,7 +44,7 @@ index bf3b5fa162..749f134328 100644
_cleanup_free_ char *timestamp_str = NULL; _cleanup_free_ char *timestamp_str = NULL;
r = parse_env_file(NULL, p, "TIMESTAMP_NSEC", &timestamp_str); r = parse_env_file(NULL, p, "TIMESTAMP_NSEC", &timestamp_str);
@@ -622,7 +622,7 @@ static int condition_test_needs_update(Condition *c, char **env) { @@ -623,7 +623,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
return true; return true;
} }

View File

@ -8,27 +8,26 @@ to 512, later 15% of the system's maximum number of PIDs. This
limit is low and a change in behavior that people running services limit is low and a change in behavior that people running services
in containers will hit frequently, so revert to previous behavior. in containers will hit frequently, so revert to previous behavior.
--- ---
man/systemd-system.conf.xml | 3 +-- man/systemd-system.conf.xml | 2 +-
src/basic/cgroup-util.h | 4 ++++ src/basic/cgroup-util.h | 4 ++++
src/core/system.conf.in | 2 +- src/core/system.conf.in | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-) 3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c64e57c277..e03e67b2f5 100644 index 0dea50f2fe..3847118881 100644
--- a/man/systemd-system.conf.xml --- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml
@@ -361,8 +361,7 @@ @@ -361,7 +361,7 @@
<listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See <listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. This setting applies to all unit types that support resource control settings, with the exception for details. This setting applies to all unit types that support resource control settings, with the exception
- of slice units. Defaults to 15%, which equals 4915 with the kernel's defaults on the host, but might be smaller - of slice units. Defaults to 15% of the sysctl setting <varname>kernel.pid_max=</varname> or root cgroup <varname>pids.max</varname>.
- in OS containers.</para></listitem>
+ of slice units. Defaults to 100%.</para></listitem> + of slice units. Defaults to 100%.</para></listitem>
</varlistentry> Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores.
For example with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
<varlistentry> but might be greater in other systems or smaller in OS containers.</para></listitem>
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 2b88571bc1..598bfc1a45 100644 index bdc0d0d086..345a99aa5c 100644
--- a/src/basic/cgroup-util.h --- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h
@@ -129,6 +129,10 @@ static inline bool CGROUP_BLKIO_WEIGHT_IS_OK(uint64_t x) { @@ -129,6 +129,10 @@ static inline bool CGROUP_BLKIO_WEIGHT_IS_OK(uint64_t x) {

View File

@ -401,16 +401,16 @@ multilib_src_install_all() {
rmdir "${ED}${rootprefix}"/sbin || die rmdir "${ED}${rootprefix}"/sbin || die
fi fi
if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
fi
# Flatcar: Upstream uses keepdir commands to keep some empty # Flatcar: Upstream uses keepdir commands to keep some empty
# directories. # directories.
# #
# Flatcar: TODO: Consider using that instead of # Flatcar: TODO: Consider using that instead of
# systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf below. # systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf below.
if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
fi
if use split-usr; then if use split-usr; then
# Avoid breaking boot/reboot # Avoid breaking boot/reboot
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
@ -584,6 +584,8 @@ pkg_postinst() {
newusergroup systemd-network newusergroup systemd-network
newusergroup systemd-resolve newusergroup systemd-resolve
newusergroup systemd-timesync newusergroup systemd-timesync
newusergroup systemd-oom
systemd_update_catalog systemd_update_catalog