Merge pull request #13188 from yuwata/news-igmp-version

network: rename `IGMPVersion=` to `MulticastIGMPVersion=`

diff --git a/NEWS b/NEWS
index 7caec644338859ae05220b92bbbdc10501a4c152..238ea4a03273b9569010ffd1c21973385639af71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,15 +2,6 @@ systemd System and Service Manager
 
 CHANGES WITH 243 in spe:
 
-        * This release enables unprivileged programs (i.e. requiring neither
-          setuid nor file capabilities) to send ICMP Echo (i.e. ping) requests
-          by turning on the net.ipv4.ping_group_range sysctl of the Linux
-          kernel for the whole UNIX group range, i.e. all processes. This
-          change should be reasonably safe, as the kernel support for it was
-          specifically implemented to allow safe access to ICMP Echo for
-          processes lacking any privileges. If this is not desirable, it can be
-          disabled again by setting the parameter to "1 0".
-
         * Previously, filters defined with SystemCallFilter= would have the
           effect that an calling an offending system call would terminate the
           calling thread. This behaviour never made much sense, since killing
@@ -257,6 +248,10 @@ CHANGES WITH 243 in spe:
           devices, as well as a new "--stats" switch for showing device
           statistics.
 
+        * networkd.conf gained a new setting SpeedMeter= and
+          SpeedMeterIntervalSec=, to measure bitrate of network interfaces. The
+          measured speed may be shown by 'networkctl status'.
+
         * systemd-networkd's .network and .link files gained a new Property=
           setting in the [Match] section, to match against devices with
           specific udev properties.

diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c
index ad26cc510e9c0c516978793ec62b3b68dac6dd3a..5b623f4b71e20b8ad4df82be24a3c0bdcf77a2b4 100644 (file)
--- a/src/boot/efi/linux.c
+++ b/src/boot/efi/linux.c
@@ -45,7 +45,7 @@ EFI_STATUS linux_exec(EFI_HANDLE *image,
 
         boot_params = (struct boot_params *) 0xFFFFFFFF;
         err = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress, EfiLoaderData,
-                                EFI_SIZE_TO_PAGES(0x4000), (UINTN *) &boot_params);
+                                EFI_SIZE_TO_PAGES(0x4000), (EFI_PHYSICAL_ADDRESS*) &boot_params);
         if (EFI_ERROR(err))
                 return err;
 

diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
index f0b4f610f850a27af52544ff1d4cbdc368a90836..27084f62424bf2cf3407c7a1a6bcc6bed2aa15b9 100644 (file)
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -30,14 +30,6 @@ net.ipv4.conf.all.accept_source_route = 0
 # Promote secondary addresses when the primary address is removed
 net.ipv4.conf.all.promote_secondaries = 1
 
-# ping(8) without CAP_NET_ADMIN and CAP_NET_RAW
-# The upper limit is set to 2^31-1. Values greater than that get rejected by
-# the kernel because of this definition in linux/include/net/ping.h:
-#   #define GID_T_MAX (((gid_t)~0U) >> 1)
-# That's not so bad because values between 2^31 and 2^32-1 are reserved on
-# systemd-based systems anyway: https://systemd.io/UIDS-GIDS.html#summary
-net.ipv4.ping_group_range = 0 2147483647
-
 # Fair Queue CoDel packet scheduler to fight bufferbloat
 net.core.default_qdisc = fq_codel