diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf new file mode 100644 index 000000000..01416c5a5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassio.conf @@ -0,0 +1,3 @@ +[unit] +Requires=etc-docker.mount var-lib-docker.mount +After=etc-docker.mount var-lib-docker.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf new file mode 100644 index 000000000..3c8d92934 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/dropbear.service.d/hassio.conf @@ -0,0 +1,7 @@ +[unit] +Requires=etc-dropbear.mount +After=etc-dropbear.mount + +[Service] +ExecStartPre= +ExecStart=-/usr/sbin/dropbear -F -R -E -p 22222 -s diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf index a4011e1c6..3e08dde48 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf @@ -1,3 +1,2 @@ [Service] -ExecStart= ExecStart=-/sbin/mingetty --noclear %I 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/local-fs.target.wants/mnt-boot.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-boot.mount 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/local-fs.target.wants/mnt-data.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-data.mount 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/local-fs.target.wants/mnt-overlay.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-overlay.mount 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 deleted file mode 120000 index 12d271be0..000000000 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/dropbear.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/dropbear.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service deleted file mode 100644 index d6b69367a..000000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/dropbear.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Dropbear SSH daemon -After=syslog.target network.target auditd.service - -[Service] -EnvironmentFile=-/etc/default/dropbear -ExecStart=/usr/sbin/dropbear -F -E -p 22222 -s -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target index 5e10ab7b4..6a38736d9 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassio-bind.target @@ -1,3 +1,4 @@ [Unit] Description=Hassio overlay targets Documentation=man:systemd.target(5) +After: local-fs.target 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 5d665debb..667065f09 100644 --- a/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch +++ b/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch @@ -1,23 +1,31 @@ -From a134477d6588a71694d4024360c0b95f305c2aac Mon Sep 17 00:00:00 2001 +From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 31 Mar 2018 16:58:14 +0200 Subject: [PATCH 1/1] NetworkManager: allow to wait on boot Signed-off-by: Pascal Vizeli --- - package/network-manager/network-manager.mk | 3 +++ - 1 file changed, 3 insertions(+) + 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..67e3767 100644 +index a520aad..fb2012a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk -@@ -100,6 +100,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD +@@ -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/multi-user.target.wants/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 diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index 67e376731..fb2012ac0 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/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 @@ -101,7 +102,7 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD $(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 + $(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