jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-24 13:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wait on network to delay the startup (#81)

Browse Source 
* Use wait on network to delay the startup

* Update nm.conf

* Create nm.conf

* Update hassos-supervisor.service

* Rename hassos.conf to docker.conf

* Create hassos.conf

* Create hassos.conf

* Update hassos.conf

* aply patch

* Mark only failed

* Fix start order
This commit is contained in:
Pascal Vizeli 2018-07-06 18:21:19 +02:00 committed by Pascal Vizeli
parent 13d0aaac0e
commit 1d74fcb91d
11 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/rootfs-overlay/etc/systemd/system/NetworkManager.service.d/hassos.conf Normal file
View File

@ -0,0 +1,2 @@
[Unit]
RequiresMountsFor=/etc/hostname /etc/hosts /etc/NetworkManager/system-connections

2
buildroot-external/rootfs-overlay/etc/systemd/system/avahi-daemon.service.d/hassos.conf Normal file
View File

@ -0,0 +1,2 @@
[Unit]
RequiresMountsFor=/etc/hostname

3
buildroot-external/rootfs-overlay/etc/systemd/system/avahi-daemon.service.d/nm.conf
View File

@ -1,2 +1,3 @@
[Unit]
After=NetworkManager.service
Wants=network-online.target
After=network-online.target

3
buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/nm.conf Normal file
View File

@ -0,0 +1,3 @@
[Unit]
Wants=network-online.target
After=network-online.target

3
buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/hassos.conf Normal file
View File

@ -0,0 +1,3 @@
[Unit]
Wants=hassos-supervisor.service
After=hassos-supervisor.service

3
buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf Normal file
View File

@ -0,0 +1,3 @@
[Unit]
Requires=docker.service
After=docker.service

4
buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/hassos.conf
View File

@ -1,3 +1,3 @@
[Unit]
Requires=docker.service
After=docker.service
Wants=hassos-supervisor.service
After=hassos-supervisor.service

3
buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
View File

@ -1,7 +1,8 @@
[Unit]
Description=HassOS supervisor
Requires=docker.service
After=docker.service rauc.service dbus.socket NetworkManager.service
Wants=network-online.target
After=docker.service rauc.service dbus.socket network-online.target
RequiresMountsFor=/mnt/data
StartLimitIntervalSec=60
StartLimitBurst=5

4
buildroot-external/rootfs-overlay/usr/sbin/hassos-rate
View File

@ -15,12 +15,12 @@ function mark_bad() {
#### Check system ####
# Docker state
if ! systemctl -q is-active docker; then
if systemctl -q is-failed docker; then
mark_bad
fi
# Docker state
if ! systemctl -q is-active hassos-supervisor; then
if systemctl -q is-failed hassos-supervisor; then
mark_bad
fi

34
buildroot-patches/0009-NetworkManager-allow-to-wait-on-boot.patch Normal file
View File

@ -0,0 +1,34 @@
From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sat, 31 Mar 2018 16:58:14 +0200
Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/network-manager/network-manager.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index a520aad..fb2012a 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -93,6 +93,7 @@ endef
define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+ mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
ln -sf /usr/lib/systemd/system/NetworkManager.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@@ -100,6 +101,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/network-online.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
endef
--
2.7.4

4
buildroot/package/network-manager/network-manager.mk
View File

@ -93,6 +93,7 @@ endef
define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
ln -sf /usr/lib/systemd/system/NetworkManager.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@ -100,6 +101,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/network-online.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
endef