diff options
| author | Yuya Kusakabe <yuya.kusakabe@gmail.com> | 2016-03-26 23:23:36 +0900 |
|---|---|---|
| committer | Yuya Kusakabe <yuya.kusakabe@gmail.com> | 2016-03-27 08:57:47 +0900 |
| commit | b1e716208f9fb92966bda9b7425d6f67911105e4 (patch) | |
| tree | 0828b5859de412485eee4b49e288db0b1ba5c363 | |
| parent | 95a28fe8b63ea97409ff6336f1b3ca419bac9961 (diff) | |
| download | vyos-build-b1e716208f9fb92966bda9b7425d6f67911105e4.tar.gz vyos-build-b1e716208f9fb92966bda9b7425d6f67911105e4.zip | |
remove installing open-vm-tools process from build-vmware-image
| -rwxr-xr-x | scripts/build-vmware-image | 12 | ||||
| -rw-r--r-- | scripts/packer.json | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image index 189461eb..e665e0b5 100755 --- a/scripts/build-vmware-image +++ b/scripts/build-vmware-image @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -# File: build-vmware-ovf +# File: build-vmware-image # Purpose: -# Build VyOS OVF for VMware. +# Build VyOS OVA and OVF for VMware. if [ ! $(which vmdk-convert) ]; then echo "Your system doesn't have vmdk-convert. Please install it from https://github.com/vmware/open-vmdk." @@ -33,16 +33,12 @@ else fi export PACKER_BUILD_DIR=packer_build -export PACKER_LOG_PATH=${PACKER_BUILD_DIR}/build_vmware_ovf.log -export PACKER_LOG=1 -mkdir -p ${PACKER_BUILD_DIR} DST_DIR=${PACKER_BUILD_DIR}/vmware - -packer build -only=vmware-image scripts/packer.json +mkdir -p ${DST_DIR} # Convert raw image to VMDK -source_image=${DST_DIR}/vyos_vmware_image.img +source_image=${PACKER_BUILD_DIR}/qemu/vyos_qemu_image.img tmp_vmdk=${DST_DIR}/tmp.vmdk vmdk=${DST_DIR}/vyos_vmware_image.vmdk ovf=${DST_DIR}/vyos_vmware_image.ovf diff --git a/scripts/packer.json b/scripts/packer.json index 52b0b284..b09b9834 100644 --- a/scripts/packer.json +++ b/scripts/packer.json @@ -46,7 +46,7 @@ "<enter><wait10><wait10>", "reboot<enter><wait5>", "Yes<enter><wait3m>", - "vyos<enter><wait>", + "vyos<enter><wait5>", "vyos<enter><wait10>", "configure<enter><wait5>", "set interface ethernet eth0 address dhcp<enter><wait5>", |