=== modified file 'src/sbin/cirros-apply'
--- src/sbin/cirros-apply	2013-01-11 18:45:46 +0000
+++ src/sbin/cirros-apply	2013-06-12 15:50:01 +0000
@@ -78,6 +78,14 @@
 	#
 	# here do any common things for $mode
 	# 
+	local hostname=""
+	if ds_get_item_path hostname || ds_get_item_path local-hostname; then
+		hostname="${_RET%%.*}"
+		echo "$hostname" > /etc/hostname
+		hostname -F /etc/hostname
+	fi
+
+    
 	## if there is a 'ephemeral0' block device, mount it
 	if find_devs_with LABEL=ephemeral0 && [ -n "${_RET}" ]; then
 		# get the first one only