patches from zack branch

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index ceb91ff07aee2c7f856a7a62c874991d7a25cffb..cf29d461a815d5e822ed102c09ff1f5d579a88ad 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -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" >"$@"