--- a/preseed/preseed.cfg	Sat Dec 10 17:06:27 2011 +0200
+++ b/preseed/preseed.cfg	Tue Dec 13 20:17:57 2011 +0200
@@ -40,7 +40,7 @@
 # XXX: this is for asdf.paivola.fi
 d-i netcfg/get_hostname                 string asdf
 d-i netcfg/get_domain                   string paivola.fi
-d-i netcfg/get_ipaddress                string 194.197.235.36
+d-i netcfg/get_ipaddress                string {NET_IPADDR}
 d-i netcfg/get_netmask                  string 255.255.255.0
 d-i netcfg/get_gateway                  string 194.197.235.1
 d-i netcfg/get_nameservers              string 194.197.235.210 194.197.235.252
@@ -138,7 +138,7 @@
 # name must be given in traditional, non-devfs format (so e.g. /dev/hda or
 # /dev/sda, and not e.g. /dev/discs/disc0/disc).
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/vda
+d-i partman-auto/disk string {GUEST_DISK}
 
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: