Changeset 68061 in vbox

Timestamp:

Jul 20, 2017 10:59:07 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117092

Message:

Unattended: Moved the unattended templates into Main where they belong and renamed their installation directory to 'UnattendedTemplates' (was 'unattended_templates'). Added them to the solaris and darwin installers. Corrected the ubuntu template to with a ubiquity/success_command line duplicating preseed/late_command so the commands actually get executed. [build fix]

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/UnattendedTemplates/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -100 +100 @@
  INST_ADDITIONS       = $(INST_DIST)additions/
  INST_ADDITIONS_ISO   = $(INST_BIN)
+ INST_UNATTENDED_TEMPLATES = $(INST_BIN)UnattendedTemplates/
 
  INST_VBOXDBG_SYMS    = $(INST_VIRTUALBOX)Contents/Resources/VBoxDbgSyms/
@@ -127 +128 @@
  INST_ADDITIONS       = $(INST_BIN)additions/
  INST_ADDITIONS_ISO   = $(INST_ADDITIONS)
+ INST_UNATTENDED_TEMPLATES = $(INST_BIN)UnattendedTemplates/
 
  INST_LIB             = lib/

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -526 +526 @@
           archive/ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),) \
         archive/additions \
-       $(if-expr defined(VBOX_UNATTENDED_TEMPLATES),archive/Unattended,) \
+       $(if-expr defined(VBOX_UNATTENDED_TEMPLATES),archive/UnattendedTemplates,) \
         install \
        $(if $(VBOX_WITH_DTRACE),\

trunk/src/VBox/Main/UnattendedTemplates/Makefile.kmk

@@ -24 +24 @@
  #       ../../Installer/Config.kmk must be updated too!
  INSTALLS += VBoxUnattendedTemplates
- VBoxUnattendedTemplates_INST = bin/UnattendedTemplates/
+ VBoxUnattendedTemplates_INST = $(INST_UNATTENDED_TEMPLATES)
  VBoxUnattendedTemplates_MODE = a+r,u+w
  VBoxUnattendedTemplates_SOURCES = \