images/ramdisk-minimal: Add systemd-config to handle watchdog

2023-08-07 17:08:24 +02:00 · 2023-08-07 17:08:24 +02:00 · 0c5aba38fa
parent 375fad72ec
commit 0c5aba38fa
4 changed files with 10 additions and 0 deletions
--- a/layers/meta-nwl-distro/conf/distro/nwl.conf
+++ b/layers/meta-nwl-distro/conf/distro/nwl.conf
@ -34,5 +34,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "ldconfig pulseaudio gobject-introspection
 DISTRO_FEATURES:remove = "ptest virtualization"

 PACKAGECONFIG:pn-systemd = "usrmerge rfkill kmod timedated vconsole"
+PACKAGECONFIG:pn-systemd-conf = ""
 PACKAGECONFIG:pn-networkmanager = "systemd nss gnutls wifi bluez5 nmcli"
 PACKAGECONFIG:pn-bluez5 = "systemd udev"
--- a/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb
+++ b/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb
@ -14,4 +14,5 @@ COREOS_IMAGE_GENERATE_SWU = "0"

 IMAGE_INSTALL:append = " \
 	networkmanager-nmcli \
+	systemd-conf \
 	"
--- a/layers/meta-nwl-distro/recipes-core/systemd/systemd-conf/system.conf
+++ b/layers/meta-nwl-distro/recipes-core/systemd/systemd-conf/system.conf
@ -0,0 +1,2 @@
+[Manager]
+RuntimeWatchdogSec=30s
--- a/layers/meta-nwl-distro/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/layers/meta-nwl-distro/recipes-core/systemd/systemd-conf_%.bbappend
@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+do_install:append() {
+    # Remove default network configurations
+    rm -rf ${D}${systemd_unitdir}/network
+}