Index: /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg
===================================================================
--- /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg	(revision 68113)
+++ /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg	(revision 68114)
@@ -26,8 +26,7 @@
 d-i clock-setup/utc-auto boolean true
 d-i clock-setup/utc boolean true
-## @todo set this
-d-i time/zone string US/Pacific
-## @todo do we want ntp? probably not if GAs are installed.
-d-i clock-setup/ntp boolean true
+d-i time/zone string @@VBOX_INSERT_TIME_ZONE_UX@@
+@@VBOX_COND_IS_INSTALLING_ADDITIONS@@d-i clock-setup/ntp boolean false@@VBOX_COND_END@@
+@@VBOX_COND_IS_NOT_INSTALLING_ADDITIONS@@d-i clock-setup/ntp boolean true@@VBOX_COND_END@@
 
 # Packages, Mirrors, Image
Index: /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg
===================================================================
--- /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg	(revision 68113)
+++ /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg	(revision 68114)
@@ -26,6 +26,7 @@
 d-i clock-setup/utc-auto boolean true
 d-i clock-setup/utc boolean true
-d-i time/zone string US/Pacific
-d-i clock-setup/ntp boolean true
+d-i time/zone string @@VBOX_INSERT_TIME_ZONE_UX@@
+@@VBOX_COND_IS_INSTALLING_ADDITIONS@@d-i clock-setup/ntp boolean false@@VBOX_COND_END@@
+@@VBOX_COND_IS_NOT_INSTALLING_ADDITIONS@@d-i clock-setup/ntp boolean true@@VBOX_COND_END@@
 
 # Packages, Mirrors, Image