Commit 3a4e59ae authored by Dimitri John Ledkov's avatar Dimitri John Ledkov Committed by Simon McVittie
Browse files

Import Debian changes 237-3ubuntu9

systemd (237-3ubuntu9) bionic; urgency=medium

  * networkd: if RA was implicit, do not await ndisc_configured.
    If RA was iplicit, meaning not otherwise requested, and a kernel default was in
    use. Do not prevent link entering configured state, whilst ndisc configuration
    is pending. Implicit kernel RA, is expected to be asynchronous and
    non-blocking. (LP: #1765173)
  * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
    This ensures that all scans are completed, before installer reaches
    partitioning stage. (LP: #1751813)
parent 31fd8f2a
systemd (237-3ubuntu9) bionic; urgency=medium
* networkd: if RA was implicit, do not await ndisc_configured.
If RA was iplicit, meaning not otherwise requested, and a kernel default was in
use. Do not prevent link entering configured state, whilst ndisc configuration
is pending. Implicit kernel RA, is expected to be asynchronous and
non-blocking. (LP: #1765173)
* udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
This ensures that all scans are completed, before installer reaches
partitioning stage. (LP: #1751813)
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 20 Apr 2018 04:35:33 +0100
systemd (237-3ubuntu8) bionic; urgency=medium
* Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
......
# Use synchronous scanning, to block update-dev in d-i/hw-detect until after the scan is done
# This ensures that partitioning stage has all the drives detected
options scsi_mod scan=sync
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Fri, 20 Apr 2018 03:24:13 +0100
Subject: UBUNTU: networkd: if RA was implicit, do not await ndisc_configured.
If RA was iplicit, meaning not otherwise requested, and a kernel default was in
use. Do not prevent link entering configured state, whilst ndisc configuration
is pending. Implicit kernel RA, is expected to be asynchronous and
non-blocking.
LP: #1765173
(cherry picked from commit 4b784890d000aab33a36f95e565469d5b76e6cbf)
---
src/network/networkd-link.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 64c4508..19eaac2 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -222,7 +222,7 @@ static bool link_proxy_arp_enabled(Link *link) {
return true;
}
-static bool link_ipv6_accept_ra_enabled(Link *link) {
+static bool link_ipv6_accept_ra_enabled_implicit(Link *link, bool * implicit) {
assert(link);
if (!socket_ipv6_is_supported())
@@ -241,9 +241,12 @@ static bool link_ipv6_accept_ra_enabled(Link *link) {
* disabled if local forwarding is enabled).
* If set, ignore or enforce RA independent of local forwarding state.
*/
- if (link->network->ipv6_accept_ra < 0)
+ if (link->network->ipv6_accept_ra < 0) {
/* default to accept RA if ip_forward is disabled and ignore RA if ip_forward is enabled */
+ if (implicit)
+ *implicit = true;
return !link_ipv6_forward_enabled(link);
+ }
else if (link->network->ipv6_accept_ra > 0)
/* accept RA even if ip_forward is enabled */
return true;
@@ -252,6 +255,10 @@ static bool link_ipv6_accept_ra_enabled(Link *link) {
return false;
}
+static bool link_ipv6_accept_ra_enabled(Link *link) {
+ return link_ipv6_accept_ra_enabled_implicit(link, NULL);
+}
+
static IPv6PrivacyExtensions link_ipv6_privacy_extensions(Link *link) {
assert(link);
@@ -771,8 +778,10 @@ void link_check_ready(Link *link) {
!link->dhcp4_configured && !link->dhcp6_configured))
return;
- if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)
- return;
+ bool implicit = false;
+ if (link_ipv6_accept_ra_enabled_implicit(link, &implicit) && !link->ndisc_configured)
+ if (!implicit)
+ return;
}
SET_FOREACH(a, link->addresses, i)
......@@ -56,3 +56,4 @@ debian/UBUNTU-Introduce-suspend-to-hibernate-8274.patch
debian/UBUNTU-shared-sleep-config-fix-unitialized-variable-and-use.patch
debian/UBUNTU-Rename-suspend-to-hibernate-to-suspend-then-hibernat.patch
debian/UBUNTU-resolved-Listen-on-both-TCP-and-UDP-by-default.patch
debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
......@@ -18,3 +18,4 @@ lib/udev/rules.d/80-net-setup-link.rules
../../extra/rules/73-special-net-names.rules lib/udev/rules.d/
../../extra/rules/73-usb-net-by-mac.rules lib/udev/rules.d/
../../extra/start-udev lib/debian-installer/
../../extra/modprobe.d-udeb/scsi-mod-scan-sync.conf lib/modprobe.d/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment