This commit is contained in:
Pascal Vizeli 2018-03-31 17:02:11 +02:00
parent 0743f0315a
commit 5c029486e9
14 changed files with 24 additions and 57 deletions

View File

@ -38,7 +38,6 @@ BR2_PACKAGE_DROPBEAR=y
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
BR2_PACKAGE_NETWORK_MANAGER=y
BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT=y
BR2_PACKAGE_DOCKER_ENGINE=y
BR2_PACKAGE_OPENVMTOOLS=y
BR2_PACKAGE_RAUC=y

View File

@ -1 +1 @@
usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount
/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/etc-docker.mount
/usr/lib/systemd/system/etc-docker.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/etc-dropbear.mount
/usr/lib/systemd/system/etc-dropbear.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/var-lib-docker.mount
/usr/lib/systemd/system/var-lib-docker.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/var-lib-systemd.mount
/usr/lib/systemd/system/var-lib-systemd.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/var-log-journal.mount
/usr/lib/systemd/system/var-log-journal.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/dropbear.service
/usr/lib/systemd/system/dropbear.service

View File

@ -1 +1 @@
usr/lib/systemd/system/mnt-boot.mount
/usr/lib/systemd/system/mnt-boot.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/mnt-data.mount
/usr/lib/systemd/system/mnt-data.mount

View File

@ -1 +1 @@
usr/lib/systemd/system/mnt-overlay.mount
/usr/lib/systemd/system/mnt-overlay.mount

View File

@ -1,50 +1,27 @@
From 9bb88ee15c3b603c39b6140c040b4a5b17c8a86a Mon Sep 17 00:00:00 2001
From a134477d6588a71694d4024360c0b95f305c2aac Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 30 Mar 2018 22:25:57 +0200
Date: Sat, 31 Mar 2018 16:58:14 +0200
Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
This patch allow a system to wait for network card on boot time.
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/network-manager/Config.in | 6 ++++++
package/network-manager/network-manager.mk | 6 ++++++
2 files changed, 12 insertions(+)
package/network-manager/network-manager.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 72658c1..1bdb225 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -62,6 +62,12 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
help
This option enables support for OpenVSwitch
+config BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT
+ bool "Wait on boot support"
+ depends on BR2_INIT_SYSTEMD
+ help
+ This option allow NetworkManager to wait on boot
+
endif
comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library"
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index a520aad..d48ffe9 100644
index a520aad..67e3767 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -102,6 +102,12 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
@@ -100,6 +100,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
ln -sf /usr/lib/systemd/system/NetworkManager.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
+ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager-wait-online.service
+
ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+
+ if [ $(BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT) == y ]; \
+ then \
+ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager-wait-online.service; \
+ fi
endef
$(eval $(autotools-package))
--
2.7.4

View File

@ -62,12 +62,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
help
This option enables support for OpenVSwitch
config BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT
bool "Wait on boot support"
depends on BR2_INIT_SYSTEMD
help
This option allow NetworkManager to wait on boot
endif
comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library"

View File

@ -100,14 +100,11 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
ln -sf /usr/lib/systemd/system/NetworkManager.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager-wait-online.service
ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
if [ $(BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT) == y ]; \
then \
ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager-wait-online.service; \
fi
endef
$(eval $(autotools-package))