diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json index 71c11f72a..760b26593 100644 --- a/centos-5.11-i386.json +++ b/centos-5.11-i386.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json index 893213e6a..28ddd11ec 100644 --- a/centos-5.11-x86_64.json +++ b/centos-5.11-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-6.8-i386.json b/centos-6.8-i386.json index 00a923345..abf98f844 100644 --- a/centos-6.8-i386.json +++ b/centos-6.8-i386.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-6.8-x86_64.json b/centos-6.8-x86_64.json index 57968dc90..a1ec1e8d5 100644 --- a/centos-6.8-x86_64.json +++ b/centos-6.8-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/centos-7.2-x86_64.json b/centos-7.2-x86_64.json index 950474a23..0566634c3 100644 --- a/centos-7.2-x86_64.json +++ b/centos-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/common/sshd.sh", "scripts/centos/networking.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/centos/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-7.11-amd64.json b/debian-7.11-amd64.json index 65072e4e2..59725180a 100644 --- a/debian-7.11-amd64.json +++ b/debian-7.11-amd64.json @@ -205,7 +205,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-7.11-i386.json b/debian-7.11-i386.json index 3a9440f5b..83eec2a14 100644 --- a/debian-7.11-i386.json +++ b/debian-7.11-i386.json @@ -205,7 +205,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-8.5-amd64.json b/debian-8.5-amd64.json index 81fa63bb3..54c3eb9ca 100644 --- a/debian-8.5-amd64.json +++ b/debian-8.5-amd64.json @@ -210,7 +210,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/debian-8.5-i386.json b/debian-8.5-i386.json index 4d06cd18a..2c5b92f5f 100644 --- a/debian-8.5-i386.json +++ b/debian-8.5-i386.json @@ -210,7 +210,9 @@ "scripts/debian/networking.sh", "scripts/debian/sudoers.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 872b3bdee..bebadd145 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -143,7 +143,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index fa6c71ac3..82f5e088f 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -148,7 +148,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 8f5a65436..2dc50354f 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -142,7 +142,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index 5473ddd5b..a7ce8c5bb 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -148,7 +148,9 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/common/vagrant.sh", "scripts/fedora/cleanup.sh", "scripts/common/minimize.sh" diff --git a/opensuse-13.2-i386.json b/opensuse-13.2-i386.json index 14cdb50df..051ee3368 100644 --- a/opensuse-13.2-i386.json +++ b/opensuse-13.2-i386.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/opensuse-13.2-x86_64.json b/opensuse-13.2-x86_64.json index 397ca82ae..a7ab28574 100644 --- a/opensuse-13.2-x86_64.json +++ b/opensuse-13.2-x86_64.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/opensuse-leap-42.1-x86_64.json b/opensuse-leap-42.1-x86_64.json index 7c56c8f54..ec3a3d9c5 100644 --- a/opensuse-leap-42.1-x86_64.json +++ b/opensuse-leap-42.1-x86_64.json @@ -162,7 +162,9 @@ "scripts/common/metadata.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/opensuse/sudoers.sh", "scripts/opensuse/zypper-locks.sh", "scripts/opensuse/remove-dvd-source.sh", diff --git a/oracle-5.11-i386.json b/oracle-5.11-i386.json index 3c9056ea4..0c63d033d 100644 --- a/oracle-5.11-i386.json +++ b/oracle-5.11-i386.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-5.11-x86_64.json b/oracle-5.11-x86_64.json index a1823691a..e7a55455c 100644 --- a/oracle-5.11-x86_64.json +++ b/oracle-5.11-x86_64.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-6.7-i386.json b/oracle-6.7-i386.json index dad40f43a..c26e478ac 100644 --- a/oracle-6.7-i386.json +++ b/oracle-6.7-i386.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-6.7-x86_64.json b/oracle-6.7-x86_64.json index e26ac6d4b..dfd77f542 100644 --- a/oracle-6.7-x86_64.json +++ b/oracle-6.7-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/oracle-7.2-x86_64.json b/oracle-7.2-x86_64.json index 30312b15a..c9068aaaf 100644 --- a/oracle-7.2-x86_64.json +++ b/oracle-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-5.11-i386.json b/rhel-5.11-i386.json index d163833c0..41b7cddd8 100644 --- a/rhel-5.11-i386.json +++ b/rhel-5.11-i386.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-5.11-x86_64.json b/rhel-5.11-x86_64.json index 0a1a5b09d..1d893ff85 100644 --- a/rhel-5.11-x86_64.json +++ b/rhel-5.11-x86_64.json @@ -146,7 +146,9 @@ "scripts/common/metadata.sh", "scripts/common/vagrant.sh", "scripts/common/sshd.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-6.8-i386.json b/rhel-6.8-i386.json index 52478967a..7b2627caf 100644 --- a/rhel-6.8-i386.json +++ b/rhel-6.8-i386.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-6.8-x86_64.json b/rhel-6.8-x86_64.json index 1f10cd5bd..bbe9c7a79 100644 --- a/rhel-6.8-x86_64.json +++ b/rhel-6.8-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/rhel-7.2-x86_64.json b/rhel-7.2-x86_64.json index b4b932d42..f933d6d2f 100644 --- a/rhel-7.2-x86_64.json +++ b/rhel-7.2-x86_64.json @@ -147,7 +147,9 @@ "scripts/centos/networking.sh", "scripts/common/sshd.sh", "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/centos/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/scripts/centos/vmware.sh b/scripts/centos/vmware.sh new file mode 100644 index 000000000..05fc1f040 --- /dev/null +++ b/scripts/centos/vmware.sh @@ -0,0 +1,8 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + yum install -y open-vm-tools; + mkdir /mnt/hgfs; + echo "platform specific vmware.sh executed"; +esac diff --git a/scripts/common/minimize.sh b/scripts/common/minimize.sh index 1ca88bee9..045d7be43 100644 --- a/scripts/common/minimize.sh +++ b/scripts/common/minimize.sh @@ -7,8 +7,8 @@ esac set +e swapuuid="`/sbin/blkid -o value -l -s UUID -t TYPE=swap`"; case "$?" in - 2|0) ;; - *) exit 1 ;; + 2|0) ;; + *) exit 1 ;; esac set -e diff --git a/scripts/common/parallels.sh b/scripts/common/parallels.sh new file mode 100644 index 000000000..16b36442e --- /dev/null +++ b/scripts/common/parallels.sh @@ -0,0 +1,24 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +parallels-iso|parallels-pvm) + mkdir -p /tmp/parallels; + mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; + VER="`cat /tmp/parallels/version`"; + + echo "Parallels Tools Version: $VER"; + + /tmp/parallels/install --install-unattended-with-deps \ + || (code="$?"; \ + echo "Parallels tools installation exited $code, attempting" \ + "to output /var/log/parallels-tools-install.log"; \ + cat /var/log/parallels-tools-install.log; \ + exit $code); + umount /tmp/parallels; + rm -rf /tmp/parallels; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/common/virtualbox.sh b/scripts/common/virtualbox.sh new file mode 100644 index 000000000..916564043 --- /dev/null +++ b/scripts/common/virtualbox.sh @@ -0,0 +1,18 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +virtualbox-iso|virtualbox-ovf) + VER="`cat /home/vagrant/.vbox_version`"; + + echo "Virtualbox Tools Version: $VER"; + + mkdir -p /tmp/vbox; + mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; + sh /tmp/vbox/VBoxLinuxAdditions.run \ + || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ + "For more read https://www.virtualbox.org/ticket/12479"; + umount /tmp/vbox; + rm -rf /tmp/vbox; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh deleted file mode 100644 index be01e42ef..000000000 --- a/scripts/common/vmtools.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -eux - -# set a default HOME_DIR environment variable if not set -HOME_DIR="${HOME_DIR:-/home/vagrant}"; - -case "$PACKER_BUILDER_TYPE" in - -virtualbox-iso|virtualbox-ovf) - VER="`cat /home/vagrant/.vbox_version`"; - - echo "Virtualbox Tools Version: $VER"; - - mkdir -p /tmp/vbox; - mount -o loop $HOME_DIR/VBoxGuestAdditions_${VER}.iso /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run \ - || echo "VBoxLinuxAdditions.run exited $? and is suppressed." \ - "For more read https://www.virtualbox.org/ticket/12479"; - umount /tmp/vbox; - rm -rf /tmp/vbox; - rm -f $HOME_DIR/*.iso; - ;; - -vmware-iso|vmware-vmx) - ubuntu_version="`lsb_release -r | awk '{print $2}'`"; - ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - - # Use open-vm-tools - if [ "$ubuntu_version" = "16.04" ]; then - apt-get install -y open-vm-tools; - mkdir /mnt/hgfs; - else - mkdir -p /tmp/vmware; - mkdir -p /tmp/vmware-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmware; - - TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; - VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; - MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; - - echo "VMware Tools Version: $VER"; - - tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; - if [ "${MAJ_VER}" -lt "10" ]; then - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; - else - /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; - fi - umount /tmp/vmware; - rm -rf /tmp/vmware; - rm -rf /tmp/vmware-archive; - rm -f $HOME_DIR/*.iso; - fi - ;; - -parallels-iso|parallels-pvm) - mkdir -p /tmp/parallels; - mount -o loop $HOME_DIR/prl-tools-lin.iso /tmp/parallels; - VER="`cat /tmp/parallels/version`"; - - echo "Parallels Tools Version: $VER"; - - /tmp/parallels/install --install-unattended-with-deps \ - || (code="$?"; \ - echo "Parallels tools installation exited $code, attempting" \ - "to output /var/log/parallels-tools-install.log"; \ - cat /var/log/parallels-tools-install.log; \ - exit $code); - umount /tmp/parallels; - rm -rf /tmp/parallels; - rm -f $HOME_DIR/*.iso; - ;; - -qemu) - echo "Don't need anything for this one" - ;; - -*) - echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."; - echo "Known are virtualbox-iso|virtualbox-ovf|vmware-iso|vmware-vmx|parallels-iso|parallels-pvm."; - ;; - -esac diff --git a/scripts/common/vmware.sh b/scripts/common/vmware.sh new file mode 100644 index 000000000..33e949698 --- /dev/null +++ b/scripts/common/vmware.sh @@ -0,0 +1,29 @@ +#!/bin/sh -eux + +# set a default HOME_DIR environment variable if not set +HOME_DIR="${HOME_DIR:-/home/vagrant}"; + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + mkdir -p /tmp/vmware; + mkdir -p /tmp/vmware-archive; + mount -o loop $HOME_DIR/linux.iso /tmp/vmware; + + TOOLS_PATH="`ls /tmp/vmware/VMwareTools-*.tar.gz`"; + VER="`echo "${TOOLS_PATH}" | cut -f2 -d'-'`"; + MAJ_VER="`echo ${VER} | cut -d '.' -f 1`"; + + echo "VMware Tools Version: $VER"; + + tar xzf ${TOOLS_PATH} -C /tmp/vmware-archive; + if [ "${MAJ_VER}" -lt "10" ]; then + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --default; + else + /tmp/vmware-archive/vmware-tools-distrib/vmware-install.pl --force-install; + fi + umount /tmp/vmware; + rm -rf /tmp/vmware; + rm -rf /tmp/vmware-archive; + rm -f $HOME_DIR/*.iso; + ;; +esac diff --git a/scripts/ubuntu/vmware.sh b/scripts/ubuntu/vmware.sh new file mode 100644 index 000000000..fed591315 --- /dev/null +++ b/scripts/ubuntu/vmware.sh @@ -0,0 +1,8 @@ +#!/bin/sh -eux + +case "$PACKER_BUILDER_TYPE" in +vmware-iso|vmware-vmx) + apt-get install -y open-vm-tools; + mkdir /mnt/hgfs; + echo "platform specific vmware.sh executed"; +esac diff --git a/sles-12-x86_64.json b/sles-12-x86_64.json index c55108180..f8215c5ba 100644 --- a/sles-12-x86_64.json +++ b/sles-12-x86_64.json @@ -163,7 +163,9 @@ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", "scripts/sles/unsupported-modules.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/sles/sudoers.sh", "scripts/sles/zypper-locks.sh", "scripts/sles/remove-dvd-source.sh", diff --git a/ubuntu-12.04-amd64.json b/ubuntu-12.04-amd64.json index 70a1b92c1..86a86568e 100644 --- a/ubuntu-12.04-amd64.json +++ b/ubuntu-12.04-amd64.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-12.04-i386.json b/ubuntu-12.04-i386.json index f7d264780..4bc3e7b44 100644 --- a/ubuntu-12.04-i386.json +++ b/ubuntu-12.04-i386.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-14.04-amd64.json b/ubuntu-14.04-amd64.json index 2c6dbeff4..d73149466 100644 --- a/ubuntu-14.04-amd64.json +++ b/ubuntu-14.04-amd64.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-14.04-i386.json b/ubuntu-14.04-i386.json index 6535db6c4..ff7e559ad 100644 --- a/ubuntu-14.04-i386.json +++ b/ubuntu-14.04-i386.json @@ -233,7 +233,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-15.10-amd64.json b/ubuntu-15.10-amd64.json index bd3bb4f81..53707ffc5 100644 --- a/ubuntu-15.10-amd64.json +++ b/ubuntu-15.10-amd64.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-15.10-i386.json b/ubuntu-15.10-i386.json index c844423f6..52c14a620 100644 --- a/ubuntu-15.10-i386.json +++ b/ubuntu-15.10-i386.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/common/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json index 9c0dee88f..5167cb95d 100644 --- a/ubuntu-16.04-amd64.json +++ b/ubuntu-16.04-amd64.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ], diff --git a/ubuntu-16.04-i386.json b/ubuntu-16.04-i386.json index 22b86dc61..bac363d74 100644 --- a/ubuntu-16.04-i386.json +++ b/ubuntu-16.04-i386.json @@ -242,7 +242,9 @@ "scripts/ubuntu/networking.sh", "scripts/ubuntu/sudoers.sh", "scripts/ubuntu/vagrant.sh", - "scripts/common/vmtools.sh", + "scripts/common/virtualbox.sh", + "scripts/ubuntu/vmware.sh", + "scripts/common/parallels.sh", "scripts/ubuntu/cleanup.sh", "scripts/common/minimize.sh" ],