From fd7a7b83175368f809b237979e3f20304a5571de Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 2 Feb 2022 16:57:13 +0100 Subject: connman: some cleaning up - Drop 0001-connman.service.in-don-t-start-if-nfs-boot.patch, since commit "ef0d26e6: rootnfs: Working rootnfs using connman", connman can handle nfs rootfs on NICs. - Change "+=" to "_append", this could avoid some cases "+=" being overridden by overrides variables. Related-to: ELB-4148 Signed-off-by: Ming Liu --- ...onnman.service.in-don-t-start-if-nfs-boot.patch | 33 ---------------------- recipes-connectivity/connman/connman_%.bbappend | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch diff --git a/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch b/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch deleted file mode 100644 index 65da8ff..0000000 --- a/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 390493e5aab8a6c859a9d14020b6b9cd09bf6f57 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Fri, 30 Dec 2016 13:43:52 +0100 -Subject: [PATCH] connman.service.in: don't start if nfs boot - -connman reconnects its NIC's. If doing a NFS boot the rootfs -connection drops and the boot will fail. -As a simple workaround do not manage the network with connman -at all. -Alternatively one could black list the network interface used -for NFS in /etc/connman/main.conf. - -Signed-off-by: Max Krummenacher ---- - src/connman.service.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/connman.service.in b/src/connman.service.in -index dab48bc..72c0c91 100644 ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -7,6 +7,8 @@ After=dbus.service network-pre.target systemd-sysusers.service - Before=network.target multi-user.target shutdown.target - Wants=network.target - Conflicts=systemd-resolved.service -+# only if not NFS mount, connman will disconnect your rootfs otherwise! -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus --- -2.12.0 - diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 330f66e..af4b20f 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/connman:" -SRC_URI += " \ - file://0001-connman.service.in-don-t-start-if-nfs-boot.patch \ +SRC_URI_append = " \ file://0002-main.conf-blacklist-rndis-nic-s.patch \ file://0003-connman-clock-ntp-client-should-not-update-time-time.patch \ " -- cgit v1.2.3