X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=171f531e6a51e483e940edddb647d99aab6404f1;hb=83d24565b48eff661a240ec4a87bdddedc9004bc;hp=ec3f2f43caabb1f4ba97585d42fd1452bf845ee8;hpb=d5bf92af2b9667ecd8856f5702400ae9f247edad;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index ec3f2f4..171f531 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -42,8 +42,9 @@ _raspberry_config: ${CFGROOT}
 	printf '%s\n' "$${RPICONFIG}" >>"$${CFGROOT}/boot/config.txt"
 
 _raspberry_initrd: ${CFGROOT}
-	printf 'nilfs2\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
-	k="$$(echo "$${CFGROOT}"/lib/modules/*-v7+)"; \
+	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"
 
@@ -111,6 +112,12 @@ _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
   ifdef wifipass
@@ -122,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