raspi modules, systemd timeout

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index 4bacb5ca6880fcb586efe774a33d065e811fe386..171f531e6a51e483e940edddb647d99aab6404f1 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -32,14 +32,22 @@ ifdef keyboard
   _config: _keyboard
 endif
 _keyboard: ${CFGROOT}
-       sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
+       -sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
 
 ifdef raspi
-  _config: _raspberry_config
+  _config: _raspberry_config _raspberry_initrd
 endif
+
 _raspberry_config: ${CFGROOT}
        printf '%s\n' "$${RPICONFIG}" >>"$${CFGROOT}/boot/config.txt"
 
+_raspberry_initrd: ${CFGROOT}
+       printf '${fstype}\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
+       k="${kernel}"; \
+       [ "$$k" ] || k="$$(echo "$${CFGROOT}"/lib/modules/*-v7+)"; \
+       chroot $${CFGROOT} update-initramfs -c -k "$${k##*/}"; \
+       printf 'initramfs initrd.img-%s\n' "$${k##*/}" >>"$${CFGROOT}/boot/config.txt"
+
 .PHONY: _timezone _locales
 
 ifdef timezone
@@ -102,6 +110,13 @@ _users: ${CFGROOT}
 
 _hostname: ${CFGROOT}
        printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
+       sed -Ei "s;^127\.0\.0\.1.*$$;&  $${hostname};" "$${CFGROOT}/etc/hosts"
+
+.PHONY: _systemd_timeout
+_config: _systemd_timeout
+_systemd_timeout: ${CFGROOT}
+       mkdir -p "$${CFGROOT}/etc/systemd"
+       printf 'DefaultTimeout%sSec=%s\n' Start 10s Stop 10s >>"$${CFGROOT}/etc/systemd/system.conf"
 
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi
@@ -114,6 +129,6 @@ ifdef wifi
     export wifi
     ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
        printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@
-       printf '  wireless-ssid "%s"\n' "$$wifi" >>$@
+       printf '  wireless-essid "%s"\n' "$$wifi" >>$@
   endif
 endif