Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 68070) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 68071) @@ -1286,6 +1286,4 @@ int fInstallTxs = -1; const char *pszMachineName = NULL; - Utf8Str strAbsSettingsFile; - const char *pszSettingsFile = NULL; bool fSetImageIdx = false; uint32_t idxImage = 0; @@ -1295,4 +1293,6 @@ Utf8Str strAbsScriptTemplatePath; const char *pszScriptTemplatePath = NULL; + Utf8Str strAbsPostInstallScriptTemplatePath; + const char *pszPostInstallScriptTemplatePath = NULL; const char *pszSessionType = "headless"; @@ -1319,6 +1319,6 @@ { "--image-index", 'm', RTGETOPT_REQ_UINT32 }, { "--script-template", 'c', RTGETOPT_REQ_STRING }, + { "--post-install-template", 'C', RTGETOPT_REQ_STRING }, { "--post-install-command", 'P', RTGETOPT_REQ_STRING }, - { "--settings-file", 's', RTGETOPT_REQ_STRING }, { "--session-type", 'S', RTGETOPT_REQ_STRING }, }; @@ -1342,11 +1342,4 @@ break; - case 's': // --settings-file - vrc = RTPathAbsCxx(strAbsSettingsFile, ValueUnion.psz); - if (RT_FAILURE(vrc)) - return errorSyntax(USAGE_UNATTENDEDINSTALL, "RTPathAbsCxx failed on '%s': %Rrc", ValueUnion.psz, vrc); - pszSettingsFile = strAbsSettingsFile.c_str(); - break; - case 'i': // --iso vrc = RTPathAbsCxx(strAbsIsoPath, ValueUnion.psz); @@ -1417,4 +1410,11 @@ break; + case 'C': // --post-install-script-template + vrc = RTPathAbsCxx(strAbsPostInstallScriptTemplatePath, ValueUnion.psz); + if (RT_FAILURE(vrc)) + return errorSyntax(USAGE_UNATTENDEDINSTALL, "RTPathAbsCxx failed on '%s': %Rrc", ValueUnion.psz, vrc); + pszPostInstallScriptTemplatePath = strAbsPostInstallScriptTemplatePath.c_str(); + break; + case 'P': // --post-install-command. pszPostInstallCommand = ValueUnion.psz; @@ -1436,6 +1436,6 @@ return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing VM name/UUID"); - if (!pszSettingsFile && !pszIsoPath) - return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing required --iso (or --settings-file) option"); + if (!pszIsoPath) + return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing required --iso option"); /* @@ -1486,7 +1486,4 @@ ComPtr ptrUnattended; CHECK_ERROR_BREAK(machine, CreateUnattendedInstaller(ptrUnattended.asOutParam())); - - if (pszSettingsFile) - CHECK_ERROR_BREAK(ptrUnattended, LoadSettings(Bstr(pszSettingsFile).raw())); if (pszIsoPath) @@ -1512,4 +1509,6 @@ if (pszScriptTemplatePath) CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(ScriptTemplatePath)(Bstr(pszScriptTemplatePath).raw())); + if (pszPostInstallScriptTemplatePath) + CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(PostInstallScriptTemplatePath)(Bstr(pszPostInstallScriptTemplatePath).raw())); if (pszPostInstallCommand) CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(PostInstallCommand)(Bstr(pszPostInstallCommand).raw())); @@ -1529,7 +1528,7 @@ HRESULT hrc2 = ptrUnattended->COMGETTER(a_Attr)(&Value); \ if (SUCCEEDED(hrc2)) \ - RTPrintf(" %22s = " a_szFmt "\n", a_szText, Value); \ + RTPrintf(" %32s = " a_szFmt "\n", a_szText, Value); \ else \ - RTPrintf(" %22s = failed: %Rhrc\n", a_szText, hrc2); \ + RTPrintf(" %32s = failed: %Rhrc\n", a_szText, hrc2); \ } while (0) #define SHOW_STR_ATTR(a_Attr, a_szText) do { \ @@ -1537,7 +1536,7 @@ HRESULT hrc2 = ptrUnattended->COMGETTER(a_Attr)(bstrString.asOutParam()); \ if (SUCCEEDED(hrc2)) \ - RTPrintf(" %22s = %ls\n", a_szText, bstrString.raw()); \ + RTPrintf(" %32s = %ls\n", a_szText, bstrString.raw()); \ else \ - RTPrintf(" %22s = failed: %Rhrc\n", a_szText, hrc2); \ + RTPrintf(" %32s = failed: %Rhrc\n", a_szText, hrc2); \ } while (0) @@ -1554,4 +1553,5 @@ SHOW_ATTR( ImageIndex, "imageIndex", ULONG, "%u"); SHOW_STR_ATTR(ScriptTemplatePath, "scriptTemplatePath"); + SHOW_STR_ATTR(PostInstallScriptTemplatePath, "postInstallScriptTemplatePath"); SHOW_STR_ATTR(PostInstallCommand, "postInstallCommand"); Index: /trunk/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh (revision 68071) +++ /trunk/src/VBox/Main/UnattendedTemplates/debian_postinstall.sh (revision 68071) @@ -0,0 +1,58 @@ +#!/bin/bash +## @file +# Post installation script template for debian-like distros. +# +# This script expects to be running chroot'ed into /target. +# + +# +# Copyright (C) 2017 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +MY_LOGFILE="/var/log/vboxpostinstall.log" +MY_EXITCODE=0 + +# Logs execution of a command. +log_command() +{ + echo "Executing: $*" >> "${MY_LOGFILE}" + "$@" 2>&1 | tee -a "${MY_LOGFILE}" + if [ "${PIPESTATUS[0]}" != "0" ]; then + echo "exit code: ${PIPESTATUS[0]}" + MY_EXITCODE=1; + fi +} + + +echo "Started: $*" >> "${MY_LOGFILE}" +echo "Date: `date -R`" >> "${MY_LOGFILE}" + +echo '' +echo 'Installing packages for building kernel modules...' +log_command apt-get -y install build-essential +log_command apt-get -y install linux-headers-$(uname -r) + +@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ +echo '' +echo 'Installing VirtualBox Guest Additions...' +log_command /bin/bash /cdrom/VBoxAdditions/VBoxLinuxAdditions.run +log_command usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@" +@@VBOX_COND_END@@ + +@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@ +echo '' +echo 'Installing Test Execution Service...' +## @todo fix this +@@VBOX_COND_END@@ + +echo "Final exit code: ${MY_EXITCODE}" >> "${MY_LOGFILE}" +exit ${MY_EXITCODE} + Index: /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/debian_preseed.cfg (revision 68071) @@ -62,18 +62,6 @@ # Custom Commands -d-i preseed/late_command string \ -mkdir -p /target/postinstall && \ -cd /target/postinstall && \ -echo '#!/bin/bash' > post-install.sh && \ -echo 'apt-get -y install build-essential' >> post-install.sh && \ -echo 'apt-get -y install linux-headers-$(uname -r)' >> post-install.sh && \ -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@echo 'echo' >> post-install.sh && \ -echo 'echo "Installing VirtualBox Guest Additions..."' >> post-install.sh && \ -echo 'bash /cdrom/VBoxAdditions/VBoxLinuxAdditions.run' >> post-install.sh && \ -echo 'usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@"' >> post-install.sh && \ -@@VBOX_COND_END@@@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@echo 'echo' >> post-install.sh && \ -echo 'echo "TODO: Installing Test Execution Service..."' >> post-install.sh && \ -@@VBOX_COND_END@@echo exit 0' >> post-install.sh && \ -chmod +x /target/postinstall/post-install.sh && \ -chroot /target /bin/bash /postinstall/post-install.sh +d-i preseed/late_command string cp /cdrom/vboxpostinstall.sh /target/root/vboxpostinstall.sh \ + && chmod +x /target/root/vboxpostinstall.sh \ + && chroot /target /bin/bash /root/vboxpostinstall.sh Index: /trunk/src/VBox/Main/UnattendedTemplates/fedora_ks.cfg =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/fedora_ks.cfg (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/fedora_ks.cfg (revision 68071) @@ -64,11 +64,6 @@ @@VBOX_COND_IS_INSTALLING_ADDITIONS@@ -mkdir -p /mnt/cdrom -mount -o ro /dev/sr2 /mnt/cdrom -echo -echo "Installing VirtualBox Guest Additions..." -bash /mnt/cdrom/VBoxLinuxAdditions.run -usermod -a -G vboxsf @@VBOX_INSERT_USER_LOGIN_SH@@ -@@VBOX_COND_END@@ +## @todo fix this. +cp /cdrom/vboxpostinstall.sh /root/vboxpostinstall.sh && chmod a+x /root/vboxpostinstall.sh && /bin/bash /root/vboxpostinstall.sh eject /dev/sr0 eject /dev/sr1 Index: /trunk/src/VBox/Main/UnattendedTemplates/ol_ks.cfg =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/ol_ks.cfg (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/ol_ks.cfg (revision 68071) @@ -72,12 +72,6 @@ %post --log=/root/ks-post.log -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ -mkdir -p /mnt/cdrom -mount -o ro /dev/sr2 /mnt/cdrom -echo -echo "Installing VirtualBox Guest Additions..." -bash /mnt/cdrom/VBoxLinuxAdditions.run -usermod -a -G vboxsf @@VBOX_INSERT_USER_LOGIN_SH@@ -@@VBOX_COND_END@@ +## @todo fix this. +cp /cdrom/vboxpostinstall.sh /root/vboxpostinstall.sh && chmod a+x /root/vboxpostinstall.sh && /bin/bash /root/vboxpostinstall.sh eject /dev/sr0 eject /dev/sr1 Index: /trunk/src/VBox/Main/UnattendedTemplates/redhat67_ks.cfg =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/redhat67_ks.cfg (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/redhat67_ks.cfg (revision 68071) @@ -71,12 +71,6 @@ %post --log=/root/ks-post.log -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ -mkdir -p /mnt/cdrom -mount -o ro /dev/sr2 /mnt/cdrom -echo -echo "Installing VirtualBox Guest Additions..." -bash /mnt/cdrom/VBoxLinuxAdditions.run -usermod -a -G vboxsf @@VBOX_INSERT_USER_LOGIN_SH@@ -@@VBOX_COND_END@@ +## @todo fix this. +cp /cdrom/vboxpostinstall.sh /root/vboxpostinstall.sh && chmod a+x /root/vboxpostinstall.sh && /bin/bash /root/vboxpostinstall.sh eject /dev/sr0 eject /dev/sr1 Index: /trunk/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh (revision 68071) +++ /trunk/src/VBox/Main/UnattendedTemplates/redhat_postinstall.sh (revision 68071) @@ -0,0 +1,60 @@ +#!/bin/bash +## @file +# Post installation script template for redhat-like distros. +# +# This script expects to be running chroot'ed into /target. +# + +# +# Copyright (C) 2017 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +MY_LOGFILE="/var/log/vboxpostinstall.log" +MY_EXITCODE=0 + +# Logs execution of a command. +log_command() +{ + echo "Executing: $*" >> "${MY_LOGFILE}" + "$@" 2>&1 | tee -a "${MY_LOGFILE}" + if [ "${PIPESTATUS[0]}" != "0" ]; then + echo "exit code: ${PIPESTATUS[0]}" + MY_EXITCODE=1; + fi +} + + +echo "Started: $*" >> "${MY_LOGFILE}" +echo "Date: `date -R`" >> "${MY_LOGFILE}" + +#echo '' +#echo 'Installing packages for building kernel modules...' +#log_command apt-get -y install build-essential +#log_command apt-get -y install linux-headers-$(uname -r) +# + +@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ +echo '' +echo 'Installing VirtualBox Guest Additions...' +## @todo fix this +log_command /bin/bash /cdrom/VBoxAdditions/VBoxLinuxAdditions.run +log_command usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@" +@@VBOX_COND_END@@ + +@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@ +echo '' +echo 'Installing Test Execution Service...' +## @todo fix this +@@VBOX_COND_END@@ + +echo "Final exit code: ${MY_EXITCODE}" >> "${MY_LOGFILE}" +exit ${MY_EXITCODE} + Index: /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg (revision 68071) @@ -62,35 +62,11 @@ # Custom Commands -d-i preseed/late_command string \ -mkdir -p /target/postinstall && \ -cd /target/postinstall && \ -echo '#!/bin/bash' > post-install.sh && \ -echo 'apt-get -y install build-essential' >> post-install.sh && \ -echo 'apt-get -y install linux-headers-$(uname -r)' >> post-install.sh && \ -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@echo 'echo' >> post-install.sh && \ -echo 'echo "Installing VirtualBox Guest Additions..."' >> post-install.sh && \ -echo 'bash /cdrom/VBoxAdditions/VBoxLinuxAdditions.run' >> post-install.sh && \ -echo 'usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@"' >> post-install.sh && \ -@@VBOX_COND_END@@@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@echo 'echo' >> post-install.sh && \ -echo 'echo "TODO: Installing Test Execution Service..."' >> post-install.sh && \ -@@VBOX_COND_END@@echo exit 0' >> post-install.sh && \ -chmod +x /target/postinstall/post-install.sh && \ -chroot /target /bin/bash /postinstall/post-install.sh +d-i preseed/late_command string cp /cdrom/vboxpostinstall.sh /target/root/vboxpostinstall.sh \ + && chmod +x /target/root/vboxpostinstall.sh \ + && chroot /target /bin/bash /root/vboxpostinstall.sh # Same as above, but for ubiquity. -ubiquity ubiquity/success_command string \ -mkdir -p /target/postinstall && \ -cd /target/postinstall && \ -echo '#!/bin/bash' > post-install.sh && \ -echo 'apt-get -y install build-essential' >> post-install.sh && \ -echo 'apt-get -y install linux-headers-$(uname -r)' >> post-install.sh && \ -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@echo 'echo' >> post-install.sh && \ -echo 'echo "Installing VirtualBox Guest Additions..."' >> post-install.sh && \ -echo 'bash /cdrom/VBoxAdditions/VBoxLinuxAdditions.run' >> post-install.sh && \ -echo 'usermod -a -G vboxsf "@@VBOX_INSERT_USER_LOGIN@@"' >> post-install.sh && \ -@@VBOX_COND_END@@@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@echo 'echo' >> post-install.sh && \ -echo 'echo "TODO: Installing Test Execution Service..."' >> post-install.sh && \ -@@VBOX_COND_END@@echo exit 0' >> post-install.sh && \ -chmod +x /target/postinstall/post-install.sh && \ -chroot /target /bin/bash /postinstall/post-install.sh +ubiquity ubiquity/success_command string cp /cdrom/vboxpostinstall.sh /target/root/vboxpostinstall.sh \ + && chmod +x /target/root/vboxpostinstall.sh \ + && chroot /target /bin/bash /root/vboxpostinstall.sh Index: /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/win_nt5_unattended.sif (revision 68071) @@ -57,5 +57,5 @@ @@VBOX_COND_IS_INSTALLING_ADDITIONS@@ [GuiRunOnce] - Command0="E:\VBoxWindowsAdditions.exe" + Command0="A:\vboxpost.cmd" @@VBOX_COND_END@@ Index: /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml (revision 68070) +++ /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml (revision 68071) @@ -126,16 +126,9 @@ reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" -@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ 2 - Install Oracle certificate - e:\cert\VBoxCertUtil.exe add-trusted-publisher e:\cert\vbox*.cer --root e:\cert\vbox*.cer + VirtualBox post guest install steps + cmd.exe /c A:\vboxpost.cmd - - 3 - Install VirtualBox Guest Additions - e:\VBoxWindowsAdditions.exe /S - -@@VBOX_COND_END@@ Index: /trunk/src/VBox/Main/UnattendedTemplates/win_postinstall.cmd =================================================================== --- /trunk/src/VBox/Main/UnattendedTemplates/win_postinstall.cmd (revision 68071) +++ /trunk/src/VBox/Main/UnattendedTemplates/win_postinstall.cmd (revision 68071) @@ -0,0 +1,29 @@ +@echo off +rem $Id$ +rem rem @file +rem Post installation script template for Windows. +rem +rem This runs after the target system has been booted, typically as +rem part of the first logon. +rem + +rem +rem Copyright (C) 2017 Oracle Corporation +rem +rem This file is part of VirtualBox Open Source Edition (OSE), as +rem available from http://www.virtualbox.org. This file is free software; +rem you can redistribute it and/or modify it under the terms of the GNU +rem General Public License (GPL) as published by the Free Software +rem Foundation, in version 2 as it comes in the "COPYING" file of the +rem VirtualBox OSE distribution. VirtualBox OSE is distributed in the +rem hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +rem + + +echo TODO + +@@VBOX_COND_IS_INSTALLING_ADDITIONS@@ +e:\cert\VBoxCertUtil.exe add-trusted-publisher e:\cert\vbox*.cer --root e:\cert\vbox*.cer +e:\VBoxWindowsAdditions.exe /S +@@VBOX_COND_END@@ + Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 68070) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 68071) @@ -3767,5 +3767,5 @@ + + + The post installation (shell/batch) script template file. + + The template default is based on the guest OS type and is determined by the + internal installer when when is invoked. + Most users will want the defaults. + + After is called, it can be read to see + which file is being used. + + + @@ -3905,9 +3918,11 @@ Exactly what is expected as input here depends on the guest OS installer - and the script template (see ). + and the post installation script template (see + ). Most users will not need to set this attribute. +