Use dhcp client / avahi after NM (#75)

* Use dhcp client / avahi after NM

* Store networkmanager

* Add default connection

* cleanup

* cleanup lease

* faster boot

* Cleanup

* Fix permission

buildroot-external/configs/ova_defconfig

@@ -40,6 +40,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/configs/rpi0_w_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/configs/rpi2_defconfig

@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/configs/rpi3_64_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/configs/rpi3_defconfig

@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/configs/rpi_defconfig

@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set

buildroot-external/rootfs-overlay/etc/NetworkManager/NetworkManager.conf

@@ -6,3 +6,6 @@ rc-manager=file
 
 [keyfile]
 unmanaged-devices=type:bridge;type:tun;type:veth
+
+[logging]
+backend=journal

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

@@ -0,0 +1,2 @@
+[Unit]
+After=NetworkManager.service

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-NetworkManager.mount

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

buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf

@@ -0,0 +1,3 @@
+# Cleanup lease files
+e /var/lib/NetworkManager/*.lease - - - 14d
+C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount

@@ -1,7 +1,7 @@
 [Unit]
 Description=NetworkManager persistent system connections
 Requires=mnt-overlay.mount
-After=mnt-overlay.mount
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
 Before=NetworkManager.service hassos-config.service
 
 [Mount]

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

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

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-NetworkManager.mount

@@ -0,0 +1,14 @@
+[Unit]
+Description=NetworkManager persistent data
+Requires=mnt-data.mount
+After=mnt-data.mount
+Before=NetworkManager.service
+
+[Mount]
+What=/mnt/overlay/var/lib/NetworkManager
+Where=/var/lib/NetworkManager
+Type=none
+Options=bind
+
+[Install]
+WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-docker.mount

@@ -1,6 +1,6 @@
 [Unit]
 Description=Docker persistent data
-Requires=mnt-data.mount docker.service
+Requires=mnt-data.mount
 After=mnt-data.mount
 Before=docker.service
 

buildroot-external/rootfs-overlay/usr/share/system-connections/default

@@ -0,0 +1,11 @@
+[connection]
+id=HassOS default
+uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
+type=802-3-ethernet
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto

buildroot-external/scripts/rootfs-layer.sh

@@ -2,10 +2,6 @@
 
 function fix_rootfs() {
 
-    # Cleanup DHCP service, we don't need this with NetworkManager
-    rm -rf ${TARGET_DIR}/etc/systemd/system/multi-user.target.wants/dhcpcd.service
-    rm -rf ${TARGET_DIR}/usr/lib/systemd/system/dhcpcd.service
-
     # Cleanup etc
     rm -rf ${TARGET_DIR}/etc/init.d
     rm -rf ${TARGET_DIR}/etc/network
@@ -20,6 +16,9 @@ function fix_rootfs() {
     # Cleanup miscs
     rm -rf ${TARGET_DIR}/usr/lib/modules-load.d
 
+    # Fix: permission for system connection files
+    chmod 600 ${TARGET_DIR}/usr/share/system-connections/*
+
     # Fix: tempfs with /srv
     sed -i "/srv/d" ${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf
 

buildroot-patches/0008-Fix-dhcp-client.patch

@@ -0,0 +1,27 @@
+From 07169ea27b84230299685f84031f07f8af74dbb4 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Wed, 4 Jul 2018 20:31:14 +0000
+Subject: [PATCH 1/1] Fix dhcp client
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/dhcp/dhcp.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
+index a1285184d3..7ea7589a28 100644
+--- a/package/dhcp/dhcp.mk
++++ b/package/dhcp/dhcp.mk
+@@ -75,8 +75,7 @@ endif
+ 
+ ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
+ define DHCP_INSTALL_CLIENT
+-	mkdir -p $(TARGET_DIR)/var/lib
+-	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
++	mkdir -p $(TARGET_DIR)/var/lib/dhcp
+ 	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
+ 		$(TARGET_DIR)/sbin/dhclient
+ 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
+-- 
+2.17.1
+

buildroot/package/dhcp/dhcp.mk

@@ -75,8 +75,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 define DHCP_INSTALL_CLIENT
-	mkdir -p $(TARGET_DIR)/var/lib
+	mkdir -p $(TARGET_DIR)/var/lib/dhcp
-	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
 	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
 		$(TARGET_DIR)/sbin/dhclient
 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \