Changeset 68057 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 20, 2017 10:38:12 AM (8 years ago)

Author:

vboxsync

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.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• UnattendedTemplates (moved) (moved from trunk/src/VBox/Installer/common/unattended_templates )
• UnattendedTemplates/debian_preseed.cfg (modified) (1 diff)
• UnattendedTemplates/ubuntu_preseed.cfg (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -34 +34 @@
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 include $(PATH_SUB_CURRENT)/cbinding/Makefile.kmk
+include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
 
 

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

@@ -63 +63 @@
 # Custom Commands
 d-i preseed/late_command string \
-mkdir /target/postinstall; \
-cd /target/postinstall; \
-touch post-install.sh; \
-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 'mkdir /mnt/cdrom' >> post-install.sh; \
-echo 'echo' >> post-install.sh; \
-echo 'echo "Installing VirtualBox Guest Additions..."' >> post-install.sh; \
-echo 'mount -t iso9660 -o ro /dev/sr1 /mnt/cdrom' >> post-install.sh; \
-echo 'bash /mnt/cdrom/VBoxLinuxAdditions.run' >> post-install.sh; \
-echo 'usermod -a -G vboxsf @@VBOX_INSERT_USER_LOGIN@@' >> post-install.sh; \
-echo 'eject /dev/sr0' >> post-install.sh; \
-@@VBOX_COND_END@@echo 'exit 0' >> post-install.sh; \
-chroot /target chmod +x /postinstall/post-install.sh; \
+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
+

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

@@ -63 +63 @@
 # Custom Commands
 d-i preseed/late_command string \
-mkdir /target/postinstall; \
-cd /target/postinstall; \
-touch post-install.sh; \
-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 'mkdir /mnt/cdrom' >> post-install.sh; \
-echo 'echo' >> post-install.sh; \
-echo 'echo "Installing VirtualBox Guest Additions..."' >> post-install.sh; \
-echo 'mount -t iso9660 -o ro /dev/sr1 /mnt/cdrom' >> post-install.sh; \
-echo 'bash /mnt/cdrom/VBoxLinuxAdditions.run' >> post-install.sh; \
-echo 'usermod -a -G vboxsf @@VBOX_INSERT_USER_LOGIN@@' >> post-install.sh; \
-echo 'eject /dev/sr0' >> post-install.sh; \
-@@VBOX_COND_END@@echo 'exit 0' >> post-install.sh; \
-chroot /target chmod +x /postinstall/post-install.sh; \
+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
+
+# 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
+