X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=fdeff3019749850a07d45cbc04155dd38ce91bb6;hb=7251742b7cfa1490d0a021974482d08bdf4acadd;hp=f52cd604246e9f523b0384bacc826db5c4c631dd;hpb=d32c1d496394986056e98c0786828a0307626964;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index f52cd60..fdeff30 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -1,27 +1,79 @@
+ifdef imagesize
+ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
+endif
+
+PACKAGES := ${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
+
 ifdef packages
-PACKAGES := ${PACKAGES} $(subst ${comma_},${space},${packages})
+PACKAGES := ${PACKAGES} $(subst ${comma_},${space_},${packages})
 endif
 
+export DEBCONF
+
+define DEBCONF :=
+keyboard-configuration	keyboard-configuration/model	select	Generic 105-key (Intl) PC
+keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
+endef
+
+.PHONY: _debconf_selections
+_install: _debconf_selections
+_debconf_selections: ${SYSROOT}
+	printf '%s\n' "$${DEBCONF}" |chroot "$${SYSROOT}" debconf-set-selections
+
+.PHONY: _timezone _locales
+
+ifdef timezone
+export timezone
+PACKAGES := ${PACKAGES} tzdata
+_config: _timezone
+endif
+
+ifdef locales
+PACKAGES := ${PACKAGES} locales
+_config: _locales
+endif
+
+_timezone: ${CFGROOT}
+	printf '%s\n' "$${timezone}" >"$${CFGROOT}/etc/timezone"
+	ln -sf /usr/share/zoneinfo/"$${timezone}" "$${CFGROOT}/etc/localtime"
+
+_locales: ${CFGROOT}
+	for l in $(subst ${comma_},${space_},${locales}); do \
+		printf '%s %s\n' "$${l}" "$${l#*.}"; \
+	done >"$${CFGROOT}/etc/locale.gen"
+	printf 'LANG=%s\n' "$(firstword $(subst ${comma_},${space_},${locales}))" >"$${CFGROOT}/etc/default/locale"
+	chroot "$${CFGROOT}" locale-gen
+
+.PHONY: _rootpass _users
+
 ifdef rootpass
 export rootpass
-.PHONY: _rootpass
 _config: _rootpass
-_rootpass: ${CFGROOT}
-	chroot "$${CFGROOT}" usermod -p "$$(openssl passwd -salt "x$${RANDOM}" "$${rootpass}")" root
 endif
 
-ifdef wifi
-export wifi
-_config: ${CFGROOT}/etc/network/interfaces.d/wifi
+ifdef users
+_config: _users
+endif
 
+_rootpass: ${CFGROOT}
+	chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root
+
+_users: ${CFGROOT}
+	for u in $(subst ${comma_},${space_},${users}); do \
+		chroot "$${CFGROOT}" useradd -m -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
+	done
+
+ifdef wifi
 ifdef wifipass
-export wifipass
+export wifi wifipass
 ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
 	printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@
 	printf '  wpa-ssid "%s"\n  wpa-psk "%s"\n' "$$wifi" "$$wifipass" >>$@
 else
+export wifi
 ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
 	printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@
 	printf '  wireless-ssid "%s"\n' "$$wifi" >>$@
 endif
+_config: ${CFGROOT}/etc/network/interfaces.d/wifi
 endif