Merge "Update buildroot with fakeroot fixes"
diff --git a/package/czechlight-cfg-fs/Config.in b/package/czechlight-cfg-fs/Config.in
index 0a3dfa6..e47d42f 100644
--- a/package/czechlight-cfg-fs/Config.in
+++ b/package/czechlight-cfg-fs/Config.in
@@ -37,4 +37,14 @@
endif # BR2_PACKAGE_NETOPEER2
+if BR2_PACKAGE_SYSTEMD
+
+config CZECHLIGHT_CFG_FS_PERSIST_NETWORK
+ bool "Persist network configuration for eth1"
+ default Y
+ help
+ Save network configuration file for eth1 into /cfg
+
+endif # BR2_PACKAGE_SYSTEMD
+
endif # BR2_PACKAGE_CZECHLIGHT_CFG_FS
diff --git a/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service b/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service
new file mode 100644
index 0000000..c8ca250
--- /dev/null
+++ b/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Restore systemd-networkd network settings from /cfg
+After=cfg.mount
+Requires=cfg.mount
+Before=network-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStartPre=/usr/bin/mkdir -p /run/systemd/network
+ExecStart=/bin/sh -c "[[ -f /cfg/network/eth1.network ]] && cp /cfg/network/eth1.network /run/systemd/network/ || true"
+
+[Install]
+WantedBy=network-pre.target
diff --git a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
index bc33805..aebc14b 100644
--- a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
+++ b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
@@ -40,6 +40,13 @@
$(TARGET_DIR)/usr/lib/systemd/system/
ln -sf ../openssh-persistent-keys.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
$(endif)
+ $(ifeq ($(CZECHLIGHT_CFG_FS_PERSIST_NETWORK),y))
+ mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/network-pre.target.wants/
+ $(INSTALL) -D -m 0644 \
+ $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service \
+ $(TARGET_DIR)/usr/lib/systemd/system/
+ ln -sf ../cfg-restore-systemd-network.service $(TARGET_DIR)/usr/lib/systemd/system/network-pre.target.wants/
+ $(endif)
endef
# Configure OpenSSH to look for *user* keys in the /cfg
diff --git a/package/velia/velia.mk b/package/velia/velia.mk
index 18f7a0c..eda5efb 100644
--- a/package/velia/velia.mk
+++ b/package/velia/velia.mk
@@ -13,7 +13,8 @@
-DNFT_EXECUTABLE=/usr/bin/nft \
-DSSH_KEYGEN_EXECUTABLE=/usr/bin/ssh-keygen \
-DCHPASSWD_EXECUTABLE=/usr/bin/chpasswd \
- -DSYSTEMCTL_EXECUTABLE=/usr/bin/systemctl
+ -DSYSTEMCTL_EXECUTABLE=/usr/bin/systemctl \
+ -DNETWORKCTL_EXECUTABLE=/usr/bin/networkctl
define VELIA_PREPARE_SERVICE
$(INSTALL) -D -m 0644 \
diff --git a/submodules/velia b/submodules/velia
index b1ddeb9..a936ee7 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit b1ddeb948573e460cc2fd6174c36fb55bc986d31
+Subproject commit a936ee77bb8ef3a18b70050ef3fa631e8c1ca0fc