summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/connman/connman_%.bbappend2
-rw-r--r--recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch (renamed from recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch)0
-rw-r--r--recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch11
3 files changed, 12 insertions, 1 deletions
diff --git a/recipes/connman/connman_%.bbappend b/recipes/connman/connman_%.bbappend
index 0b03755..fda246a 100644
--- a/recipes/connman/connman_%.bbappend
+++ b/recipes/connman/connman_%.bbappend
@@ -21,4 +21,4 @@
21 21
22FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 22FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
23 23
24SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch" 24SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
index f893746..f893746 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
new file mode 100644
index 0000000..8b46666
--- /dev/null
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
@@ -0,0 +1,11 @@
1--- a/src/connman.service.in
2+++ b/src/connman.service.in
3@@ -7,6 +7,7 @@
4 Before=network.target multi-user.target shutdown.target
5 Wants=network.target
6 Conflicts=systemd-resolved.service
7+ConditionKernelCommandLine=!root=/dev/nfs
8
9 [Service]
10 Type=dbus
11