X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=efb83589b198ad0cf78d19d14c688504092f3b55;hb=26f60dd8e15bd0006b1db60984bf4b65f069f95f;hp=2bc1a8dc8f43a8aacf15425476508cda41df99ad;hpb=0861fbbecb4d9fc8c27c4bd6a40fbda633689605;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index 2bc1a8d..efb8358 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -2,7 +2,7 @@ ifdef imagesize
   ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
 endif
 
-PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan dnsutils file firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client pciutils psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
@@ -107,7 +107,7 @@ ${rootkey}.pub:
 	[ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
 _rootkey: ${CFGROOT} ${rootkey}.pub
-	mkdir -m 700 "$${CFGROOT}/root/.ssh/"
+	mkdir -pm 700 "$${CFGROOT}/root/.ssh/"
 	cp "$${rootkey}.pub" "$${CFGROOT}/root/.ssh/authorized_keys"
 
 _users: ${CFGROOT}
@@ -119,6 +119,10 @@ _hostname: ${CFGROOT}
 	printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
 	sed -Ei "s;^127\.0\.0\.1.*$$;&	$${hostname};" "$${CFGROOT}/etc/hosts"
 
+_timeouts: ${CFGROOT}
+	printf '%s\n' DefaultTimeoutStartSec=10s DefaultTimeoutStopSec=10s >>"${CFGROOT}/etc/systemd/system.conf"
+
+
 .PHONY: _systemd_timeout
 _config: _systemd_timeout
 _systemd_timeout: ${CFGROOT}