Changeset 68126 in vbox

Timestamp:

Jul 26, 2017 3:52:17 PM (7 years ago)

Author:

vboxsync

Message:

Unatteded: Added hostname attribute. Updated debian and ubuntu templates to pick up new properties.

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/debian_preseed.cfg (modified) (3 diffs)
• UnattendedTemplates/ubuntu_preseed.cfg (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg

@@ -13 +13 @@
 
 # Locale
-d-i debian-installer/locale string en_US
+d-i debian-installer/locale string @@VBOX_INSERT_LOCALE@@
 d-i console-setup/ask_detect boolean false
 d-i console-setup/layoutcode string us
@@ -19 +19 @@
 
 # Network
-d-i netcfg/get_hostname string ubuntu
-d-i netcfg/get_domain string virtualMachine
+d-i netcfg/get_hostname string @@VBOX_INSERT_HOSTNAME_WITHOUT_DOMAIN@@
+d-i netcfg/get_domain string @@VBOX_INSERT_HOSTNAME_DOMAIN@@
 d-i netcfg/choose_interface select auto
 
@@ -34 +34 @@
 d-i base-installer/kernel/override-image string linux-image-amd64
 ## @todo use nearest mirror somehow...
-# debug tip: Replace US with DE.
-d-i mirror/country string US
+d-i mirror/country string @@VBOX_INSERT_COUNTRY@@
+## @todo proxy fun...
 d-i mirror/http/proxy string
 d-i pkgsel/install-language-support boolean false
-# debug tip: disable the following for minimal install
+@@VBOX_COND_IS_NOT_MINIMAL_INSTALLATION@@
 d-i apt-setup/restricted boolean true
 d-i apt-setup/universe boolean true
-# debug tip: enable the following for minimal install
-#   tasksel tasksel/first multiselect minimal
-#   d-i pkgsel/include string openssh-server
-#   d-i pkgsel/upgrade select none
+@@VBOX_COND_END@@@@VBOX_COND_IS_MINIMAL_INSTALLATION@@
+tasksel tasksel/first multiselect minimal
+d-i pkgsel/include string openssh-server
+d-i pkgsel/upgrade select none
+@@VBOX_COND_END@@
 
 # Users

trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg

@@ -13 +13 @@
 
 # Locale
-d-i debian-installer/locale string en_US
+d-i debian-installer/locale string @@VBOX_INSERT_LOCALE@@
 d-i console-setup/ask_detect boolean false
 d-i console-setup/layoutcode string us
@@ -19 +19 @@
 
 # Network
-d-i netcfg/get_hostname string ubuntu
-d-i netcfg/get_domain string virtualMachine
+d-i netcfg/get_hostname string @@VBOX_INSERT_HOSTNAME_WITHOUT_DOMAIN@@
+d-i netcfg/get_domain string @@VBOX_INSERT_HOSTNAME_DOMAIN@@
 d-i netcfg/choose_interface select auto
 
@@ -33 +33 @@
 d-i base-installer/kernel/override-image string linux-server
 d-i base-installer/kernel/override-image string linux-image-amd64
-d-i mirror/country string US
+## @todo use nearest mirror somehow...
+d-i mirror/country string @@VBOX_INSERT_COUNTRY@@
 d-i mirror/http/proxy string
+## @todo minimal install.
 d-i apt-setup/restricted boolean true
 d-i apt-setup/universe boolean true

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3767 +3767 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="68d72757-773b-4c13-9956-b5aa0a28e4a7"
+    uuid="da34bfb3-437a-4510-6c7e-7687b00d378d"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="16"
@@ -3929 +3929 @@
         package specifiers.  Currently the 'minimal' is the only recognized value,
         and this only works with a selection of linux installers.
+      </desc>
+    </attribute>
+
+    <attribute name="hostname" type="wstring">
+      <desc>
+        The fully qualified guest hostname.
+
+        This defaults to machine-name + ".myguest.virtualbox.org", though it may
+        change to the host domain name later.
       </desc>
     </attribute>