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

diff --git a/modules/default.mk b/modules/default.mk
index fdeff30..47f958b 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -1,11 +1,11 @@
 ifdef imagesize
-ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
+  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
+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 += $(subst ${comma_},${space_},${packages})
 endif
 
 export DEBCONF
@@ -23,14 +23,14 @@ _debconf_selections: ${SYSROOT}
 .PHONY: _timezone _locales
 
 ifdef timezone
-export timezone
-PACKAGES := ${PACKAGES} tzdata
-_config: _timezone
+  export timezone
+  PACKAGES += tzdata
+  _config: _timezone
 endif
 
 ifdef locales
-PACKAGES := ${PACKAGES} locales
-_config: _locales
+  PACKAGES += locales
+  _config: _locales
 endif
 
 _timezone: ${CFGROOT}
@@ -44,15 +44,20 @@ _locales: ${CFGROOT}
 	printf 'LANG=%s\n' "$(firstword $(subst ${comma_},${space_},${locales}))" >"$${CFGROOT}/etc/default/locale"
 	chroot "$${CFGROOT}" locale-gen
 
-.PHONY: _rootpass _users
+.PHONY: _rootpass _users _hostname
 
 ifdef rootpass
-export rootpass
-_config: _rootpass
+  export rootpass
+  _config: _rootpass
 endif
 
 ifdef users
-_config: _users
+  _config: _users
+endif
+
+ifdef hostname
+  export hostname
+  _config: _hostname
 endif
 
 _rootpass: ${CFGROOT}
@@ -63,17 +68,20 @@ _users: ${CFGROOT}
 		chroot "$${CFGROOT}" useradd -m -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
 	done
 
+_hostname: ${CFGROOT}
+	printf '%s\n' "$${hostname}" "$${CFGROOT}/etc/hostname"
+
 ifdef wifi
-ifdef wifipass
-export wifi wifipass
-${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
+  _config: ${CFGROOT}/etc/network/interfaces.d/wifi
+  ifdef 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}
+  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
 endif