X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=ec3f2f43caabb1f4ba97585d42fd1452bf845ee8;hb=HEAD;hp=ceb91ff07aee2c7f856a7a62c874991d7a25cffb;hpb=65d5276ca5bbce290dd1fb4a9d5285176584df02;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index ceb91ff..0957d2b 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 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}
@@ -139,3 +143,33 @@ ifdef wifi
 	printf '  wireless-essid "%s"\n' "$$wifi" >>$@
   endif
 endif
+
+.PHONY: _fstab
+
+ifdef _fstab
+  _config: ${CFGROOT}/etc/fstab
+  export _fstab
+
+else
+  ifdef fsuuid
+    define _fstab :=
+UUID=${fsuuid}	/		btrfs	auto,rw,subvol=${release}	0 0
+UUID=${fsuuid}	/home		btrfs	auto,nofail,rw,subvol=home	0 0
+UUID=${fsuuid}	/mnt/fsroot	btrfs	auto,nofail,rw			0 0
+LABEL=SWAP	swap		swap	auto,nofail,sw			0 0
+LABEL=EFIBOOT	/boot/efi	vfat	auto,nofail,ro			0 0
+endef
+    _config: ${CFGROOT}/etc/fstab
+    export _fstab
+
+  endif
+endif
+
+${CFGROOT}/etc/fstab: ${CFGROOT}
+	printf '%s' "$${_fstab}" >"$@"
+
+
+_config: ${CFGROOT}/etc/sysctl.d/quiet_console
+
+${CFGROOT}/etc/sysctl.d/quiet_console: ${CFGROOT}
+	printf '%s\n' "kernel.printk=3 4 1 7" >"$@"