From 5c029486e9184f67aab73043160795aa4ad22047 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 31 Mar 2018 17:02:11 +0200 Subject: [PATCH] Fix link --- buildroot-external/configs/ova_defconfig | 1 - ...tworkManager-system\\x2dconnections.mount" | 2 +- .../hassio-bind.target.wants/etc-docker.mount | 2 +- .../etc-dropbear.mount | 2 +- .../var-lib-docker.mount | 2 +- .../var-lib-systemd.mount | 2 +- .../var-log-journal.mount | 2 +- .../multi-user.target.wants/dropbear.service | 2 +- .../multi-user.target.wants/mnt-boot.mount | 2 +- .../multi-user.target.wants/mnt-data.mount | 2 +- .../multi-user.target.wants/mnt-overlay.mount | 2 +- ...NetworkManager-allow-to-wait-on-boot.patch | 45 +++++-------------- buildroot/package/network-manager/Config.in | 6 --- .../network-manager/network-manager.mk | 9 ++-- 14 files changed, 24 insertions(+), 57 deletions(-) diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 8b06b5a44..439c15ab2 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -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 diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" index 61ec2cd7a..440f4a731 120000 --- "a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" +++ "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" @@ -1 +1 @@ -usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount \ No newline at end of file +/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount index 856d6a932..232985c3e 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-docker.mount @@ -1 +1 @@ -usr/lib/systemd/system/etc-docker.mount \ No newline at end of file +/usr/lib/systemd/system/etc-docker.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount index bed6d1cc0..4a225123b 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount @@ -1 +1 @@ -usr/lib/systemd/system/etc-dropbear.mount \ No newline at end of file +/usr/lib/systemd/system/etc-dropbear.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount index d2013f5ab..467de4f6f 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-docker.mount @@ -1 +1 @@ -usr/lib/systemd/system/var-lib-docker.mount \ No newline at end of file +/usr/lib/systemd/system/var-lib-docker.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount index a0d4e52a7..4a7127d20 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount @@ -1 +1 @@ -usr/lib/systemd/system/var-lib-systemd.mount \ No newline at end of file +/usr/lib/systemd/system/var-lib-systemd.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount index f63cb3856..efc836fc0 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount @@ -1 +1 @@ -usr/lib/systemd/system/var-log-journal.mount \ No newline at end of file +/usr/lib/systemd/system/var-log-journal.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service index e902b3085..12d271be0 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service @@ -1 +1 @@ -usr/lib/systemd/system/dropbear.service \ No newline at end of file +/usr/lib/systemd/system/dropbear.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount index e23b5a033..909c6e93d 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount @@ -1 +1 @@ -usr/lib/systemd/system/mnt-boot.mount \ No newline at end of file +/usr/lib/systemd/system/mnt-boot.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount index b02e92ea7..62a16cffe 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount @@ -1 +1 @@ -usr/lib/systemd/system/mnt-data.mount \ No newline at end of file +/usr/lib/systemd/system/mnt-data.mount \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount index b17c14b3c..f3df5f297 120000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount @@ -1 +1 @@ -usr/lib/systemd/system/mnt-overlay.mount \ No newline at end of file +/usr/lib/systemd/system/mnt-overlay.mount \ No newline at end of file diff --git a/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch b/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch index 95c741520..5d665debb 100644 --- a/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch +++ b/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch @@ -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 -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 --- - 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 diff --git a/buildroot/package/network-manager/Config.in b/buildroot/package/network-manager/Config.in index 1bdb225d6..72658c127 100644 --- a/buildroot/package/network-manager/Config.in +++ b/buildroot/package/network-manager/Config.in @@ -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" diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index d48ffe922..67e376731 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/package/network-manager/network-manager.mk @@ -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))