X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=6282070a5f4cb19fe95687fab62988204884ee77;hb=b136fd10a1cc4d68130cd68c57696fd9664f0097;hp=5a21e36d22f5ab94599489f94f86ea5c751c8ab1;hpb=0cb5b61d02a2fb4dbfc0c40a63aa39d98899c77a;p=blast diff --git a/modules/default.mk b/modules/default.mk index 5a21e36..6282070 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-tools 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 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 ifdef packages PACKAGES += $(subst ${comma_},${space_},${packages}) @@ -20,7 +20,7 @@ endef define RPICONFIG := ${RPICONFIG} -dtoverlay=vc4-fkms-v3d,cma-128 +dtoverlay=vc4-fkms-v3d,cma-256 endef .PHONY: _debconf_selections _raspberry_config @@ -83,7 +83,7 @@ _rootpass: ${CFGROOT} chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root ${rootkey}.pub: - ssh-keygen -N '' -f "$${rootkey}" + [ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}" _rootkey: ${CFGROOT} ${rootkey}.pub mkdir -m 700 "$${CFGROOT}/root/.ssh/" @@ -91,7 +91,7 @@ _rootkey: ${CFGROOT} ${rootkey}.pub _users: ${CFGROOT} for u in $(subst ${comma_},${space_},${users}); do \ - chroot "$${CFGROOT}" useradd -m -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \ + chroot "$${CFGROOT}" useradd -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \ done _hostname: ${CFGROOT}