X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=bb4f432ceadd9298c7f6e3321d36fc55f5e207e1;hb=cfc45b9c33c0fa4165c8324c710fa9b4b61017e0;hp=e8e4fd1ed3dcdfd2b9869bd55219db3361c66a9d;hpb=ce6b1ef14dfa506b8eb56fba270056ddbaecaf73;p=blast diff --git a/modules/default.mk b/modules/default.mk index e8e4fd1..bb4f432 100644 --- a/modules/default.mk +++ b/modules/default.mk @@ -15,6 +15,9 @@ ${DEBCONF} keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC keyboard-configuration keyboard-configuration/variant select English (US) - English (Macintosh) + +console-setup console-setup/charmap47 select UTF-8 +console-setup console-setup/codeset47 select # Latin1 and Latin5 - western Europe and Turkic languages endef ifndef rpivmem @@ -136,3 +139,27 @@ 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}" >"$@"