diff --git a/.gitignore b/.gitignore index d2d54406..8ee5027e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,10 @@ Makefile.local rspec_html_reports .DS_Store + +*.*.json +floppy/*.*.* +script/*.*.* +floppy/_packer_config_*.cmd + + diff --git a/Makefile b/Makefile index 816a3507..c9c380be 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ ifndef CM_VERSION CM_VERSION = latest endif endif + BOX_VERSION ?= $(shell cat VERSION) UPDATE ?= false GENERALIZE ?= false @@ -154,117 +155,117 @@ define SHORTCUT ifeq ($(UNAME_S),Darwin) -$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) else -$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) endif -vmware/$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +vmware/$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -vmware/$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +vmware/$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -vmware/$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +vmware/$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -virtualbox/$(1): $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1): $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -virtualbox/$(1)-cygwin: $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1)-cygwin: $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -virtualbox/$(1)-ssh: $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1)-ssh: $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -parallels/$(1): $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +parallels/$(PREFIX)$(1): $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -parallels/$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +parallels/$(PREFIX)$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -parallels/$(1)-ssh: $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +parallels/$(PREFIX)$(1)-ssh: $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -hyperv/$(1): $(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1): $(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -hyperv/$(1)-cygwin: $(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1)-cygwin: $(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -hyperv/$(1)-ssh: $(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1)-ssh: $(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-vmware/$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-vmware/$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-vmware/$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-virtualbox/$(1): test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1): test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-virtualbox/$(1)-cygwin: test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1)-cygwin: test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-virtualbox/$(1)-ssh: test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1)-ssh: test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-parallels/$(1): test-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1): test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-parallels/$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-parallels/$(1)-ssh: test-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1)-ssh: test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-hyperv/$(1): test-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1): test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-hyperv/$(1)-cygwin: test-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1)-cygwin: test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-hyperv/$(1)-ssh: test-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1)-ssh: test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-vmware/$(1): ssh-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1): ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-vmware/$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-vmware/$(1)-ssh: ssh-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1)-ssh: ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-virtualbox/$(1): ssh-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1): ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-virtualbox/$(1)-cygwin: ssh-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1)-cygwin: ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-virtualbox/$(1)-ssh: ssh-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1)-ssh: ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-parallels/$(1): ssh-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1): ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-parallels/$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-parallels/$(1)-ssh: ssh-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1)-ssh: ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-hyperv/$(1): ssh-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1): ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-hyperv/$(1)-cygwin: ssh-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1)-cygwin: ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-hyperv/$(1)-ssh: ssh-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1)-ssh: ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-vmware/$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-vmware/$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-virtualbox/$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-virtualbox/$(PREFIX)$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-parallels/$(1): s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-parallels/$(PREFIX)$(1): s3cp-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-hyperv/$(1): s3cp-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-hyperv/$(PREFIX)$(1): s3cp-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) endef SHORTCUT_TARGETS := $(basename $(TEMPLATE_FILENAMES)) @@ -408,65 +409,65 @@ test-eval-openssh: test-eval-win2012r2-datacenter test-eval-win2008r2-datacenter define BUILDBOX -$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json endef $(eval $(call BUILDBOX,win2008r2-datacenter,$(WIN2008R2_X64),$(WIN2008R2_X64_CHECKSUM))) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index 01817afd..b77c2da3 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -49,7 +49,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -96,7 +96,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -131,7 +131,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index ef548e40..805f2f0f 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -48,7 +48,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -94,7 +94,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -128,7 +128,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 6ec43db0..0c2f80e3 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -48,7 +48,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -94,7 +94,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -128,7 +128,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index 73e833d3..1392230c 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -49,7 +49,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -96,7 +96,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", @@ -131,7 +131,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/cygwin.bat", diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index d1ed1f7a..1164be6c 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -48,7 +48,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -94,7 +94,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -128,7 +128,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index c1e80951..69642454 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -48,7 +48,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -94,7 +94,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -128,7 +128,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/_post_update_install.bat", "{{template_dir}}/floppy/autologon.bat", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 4f60199b..5a5eff7a 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -77,7 +77,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -107,7 +107,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 878377fb..6fc212f7 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -77,7 +77,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -107,7 +107,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index eeb1b6f4..e2a00adb 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -79,7 +79,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -110,7 +110,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index bce17f00..462cd29b 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -77,7 +77,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -107,7 +107,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 85d21fd1..4c12bd6b 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -42,7 +42,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -75,7 +75,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -104,7 +104,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 1bcf88ec..9ccefc1b 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -77,7 +77,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -107,7 +107,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 5ba282e1..4423610b 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index c8272660..cf223c38 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -84,7 +84,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -121,7 +121,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index c5b6c5f8..c9555de5 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index 0d057259..8fea4224 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index efb14c42..46e2be0a 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -84,7 +84,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -121,7 +121,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index fc30b727..d30c4b06 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 1c7f81ac..41a4a7cb 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index d3e1e16f..9bd167ba 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -84,7 +84,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -121,7 +121,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index 72d718a0..ce98548d 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -124,7 +124,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index 73fc13d8..aa3f1036 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -45,7 +45,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -81,7 +81,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -113,7 +113,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 07c75e0a..a57d6d34 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -45,7 +45,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -81,7 +81,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -113,7 +113,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index b3de49d6..a4eda71d 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -45,7 +45,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -81,7 +81,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -113,7 +113,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index 1f016a2b..47ba7622 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -45,7 +45,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -81,7 +81,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -113,7 +113,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 753110f0..5ab14885 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -79,7 +79,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -110,7 +110,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 8e541b69..e658dd5d 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -79,7 +79,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -110,7 +110,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 29e6e602..2dc1ca79 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -116,7 +116,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index fc21eb1e..f1a0b405 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -116,7 +116,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index af5cd869..d1300184 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -45,7 +45,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -88,7 +88,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -119,7 +119,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index f9717274..f4dab180 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", @@ -116,7 +116,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/cygwin.bat", "{{template_dir}}/floppy/cygwin.sh", "{{template_dir}}/floppy/disablewinupdate.bat", diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 177ff9e6..dac83d44 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -43,7 +43,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -84,7 +84,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", @@ -113,7 +113,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/install-winrm.cmd", "{{template_dir}}/floppy/openssh.bat", diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index 5b22e65a..0532632a 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -10,7 +10,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -44,7 +44,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -86,7 +86,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", @@ -116,7 +116,7 @@ "{{template_dir}}/floppy/00-run-all-scripts.cmd", "{{template_dir}}/floppy/01-install-wget.cmd", "{{template_dir}}/floppy/_download.cmd", - "{{template_dir}}/floppy/_packer_config.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", "{{template_dir}}/floppy/disablewinupdate.bat", "{{template_dir}}/floppy/fixnetwork.ps1", "{{template_dir}}/floppy/install-winrm.cmd", diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index c33f0f48..6a45ab4a 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -10,23 +10,15 @@ if not defined WGET_URL set WGET_URL=https://eternallybored.org/misc/wget/curren for %%i in ("%WGET_URL%") do set filename=%SystemRoot%\%%~nxi -if not exist "%~dp0\_download.cmd" goto _download_cmd_not_found - copy /y "%~dp0\_download.cmd" "%SystemRoot%\" call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -:_download_cmd_not_found - -echo ==^> Downloading "%WGET_URL%" to "%filename%" - -:powershell - -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WGET_URL%', '%filename%')" ERROR: _download.cmd called without URL parameter. & goto exit1 @@ -31,8 +31,8 @@ echo ==^> Copying "%found%" to "%filename%", skipping download. copy /y "%found%" "%filename%" && goto exit0 :download - -echo ==^> Downloading "%url%" to "%filename%" +REM IT IS JUST CLEANER WITH THIS WGET IS REALLY PICKY. POWERSHELL - NOT SO MUCH +if defined http_proxy goto powershell set wget= @@ -46,15 +46,37 @@ if defined wget goto wget if not exist "%wget%" goto powershell +echo ==^> Downloading "%url%" to "%filename%" using "%wget%"... + if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose +if defined http_proxy ( + if defined http_proxy_user if defined http_proxy_password ( + set WGET_OPTS=%WGET_OPTS% --proxy-user='%http_proxy_user%' --proxy-passwd='%http_proxy_password%' + ) +) + "%wget%" --no-check-certificate %WGET_OPTS% -O "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 :powershell +echo ==^> Downloading "%url%" to "%filename%" using "Powershell"... + +if defined http_proxy ( + set "ps1_proxy=$wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ;" + if defined http_proxy_user if defined http_proxy_password ( + set "ps1_proxy_auth=$wc.proxy.Credentials = (New-Object System.Net.NetworkCredential('%http_proxy_user%', '%http_proxy_password%')) ;" + ) -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" nul if not errorlevel 1 if exist "%filename%" goto exit0 @@ -66,7 +88,9 @@ for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe -if not exist "%bitsadmin%" goto powershell +if not exist "%bitsadmin%" goto exit 1 + +echo ==^> Downloading "%url%" to "%filename%" using "BITS"... for %%i in ("%filename%") do set jobname=%%~nxi diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index e18ca80d..6ede89e2 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -13,6 +13,11 @@ :: Default: z:\c\packer_logs :: set PACKER_LOG_DIR=z:\c\packer_logs +:: Uncomment the following to disable BITS so scripts can fail instead of hanging when +:: BITS doesn't work right. +:: Default: (unset) +:: set DISABLE_BITS=1 + :: Uncomment the following to change the pagefile size in MB as set by :: floppy/pagefile.bat :: Default: 512 diff --git a/floppy/_post_update_install.bat b/floppy/_post_update_install.bat index a682d3cb..7fe9a5cd 100644 --- a/floppy/_post_update_install.bat +++ b/floppy/_post_update_install.bat @@ -9,7 +9,7 @@ REM want to run scripts following all updates/reboots. title Running post update scripts. Please wait... @for %%i in (%~dp0\zz*.cmd) do ( - echo ==^> Running "%%~i" + echo ==^> Running "%%~i" @call "%%~i" ) diff --git a/floppy/bitvisessh.bat b/floppy/bitvisessh.bat index 5b54a246..b0b0bef0 100644 --- a/floppy/bitvisessh.bat +++ b/floppy/bitvisessh.bat @@ -17,9 +17,6 @@ pushd "%BITVISE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%BITVISE_URL%" "%BITVISE_PATH%" -) else ( - echo ==^> Downloading "%BITVISE_URL%" to "%BITVISE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%BITVISE_URL%', '%BITVISE_PATH%')" Downloading "%CYGWIN_URL%" to "%CYGWIN_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%CYGWIN_URL%', '%CYGWIN_PATH%')" Work 3 true + true diff --git a/floppy/eval-win10x86-enterprise/Autounattend.xml b/floppy/eval-win10x86-enterprise/Autounattend.xml index 7a414603..22bf5ddb 100644 --- a/floppy/eval-win10x86-enterprise/Autounattend.xml +++ b/floppy/eval-win10x86-enterprise/Autounattend.xml @@ -92,6 +92,7 @@ true Work 3 + true diff --git a/floppy/hotfix-KB2842230.bat b/floppy/hotfix-KB2842230.bat index 6727c143..be5a828f 100644 --- a/floppy/hotfix-KB2842230.bat +++ b/floppy/hotfix-KB2842230.bat @@ -29,9 +29,6 @@ pushd "%HOTFIX_2842230_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HOTFIX_2842230_URL%" "%HOTFIX_2842230_PATH%" -) else ( - echo ==^> Downloading "%HOTFIX_2842230_URL%" to "%HOTFIX_2842230_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HOTFIX_2842230_URL%', '%HOTFIX_2842230_PATH%')" Downloading "%OPENSSH_URL%" to "%OPENSSH_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%OPENSSH_URL%', '%OPENSSH_PATH%')" Downloading "%WUA_URL%" to "%WUA_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WUA_URL%', '%WUA_PATH%')" nul 2>nul && ( echo ==^> Configuring %%i service to autostart sc config %%i start= auto - + echo ==^> Starting the %%i service sc start %%i ) diff --git a/script/01-install-handle.cmd b/script/01-install-handle.cmd index c13cae58..422a3e75 100644 --- a/script/01-install-handle.cmd +++ b/script/01-install-handle.cmd @@ -14,9 +14,6 @@ pushd "%HANDLE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HANDLE_URL%" "%HANDLE_PATH%" -) else ( - echo ==^> Downloading "%HANDLE_URL%" to "%HANDLE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HANDLE_URL%', '%HANDLE_PATH%')" Using Chef Omnitruck API URL: !url! -powershell -command "(New-Object System.Net.WebClient).DownloadFile('!url!', '!filename!')" +call "%SystemRoot%\_download.cmd" !url! !filename! if not exist "%TEMP%\omnitruck.txt" ( echo Unable to download metadata for %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% on the %OMNITRUCK_CHANNEL% channel for %OMNITRUCK_PLATFORM% %OMNITRUCK_MACHINE_ARCH% @@ -136,9 +136,6 @@ pushd "%CHEF_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CHEF_URL%" "%CHEF_PATH%" -) else ( - echo ==^> Downloading %CHEF_URL% to %CHEF_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"%CHEF_URL%\", '%CHEF_PATH%')" Downloading %PUPPET_URL% to %PUPPET_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%PUPPET_URL%', '%PUPPET_PATH%')" Downloading %SALT_URL% to %SALT_DOWNLOAD% -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD% @@ -301,7 +296,7 @@ if "%CM_VERSION%" == "latest" ( set SALT_PATH=%SALT_DIR%\Salt-Minion-Setup.exe echo ==^> Downloading %SALT_URL% to %SALT_PATH% -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Installing Salt minion %CM_VERSION%-%SALT_PYTHONVERSION% with %SALT_PATH% diff --git a/script/sdelete.bat b/script/sdelete.bat index 26dc7e21..6943ea6c 100644 --- a/script/sdelete.bat +++ b/script/sdelete.bat @@ -14,9 +14,6 @@ pushd "%SDELETE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SDELETE_URL%" "%SDELETE_PATH%" -) else ( - echo ==^> Downloading "%SDELETE_URL%" to "%SDELETE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SDELETE_URL%', '%SDELETE_PATH%')" Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Downloading "%ULTRADEFRAG_URL%" to "%ULTRADEFRAG_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%ULTRADEFRAG_URL%', '%ULTRADEFRAG_PATH%')" Downloading "%VAGRANT_PUB_URL%" to "%VAGRANT_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VAGRANT_PUB_URL%', '%VAGRANT_PATH%')" Creating "%SEVENZIP_DIR%" mkdir "%SEVENZIP_DIR%" cd /d "%SEVENZIP_DIR%" -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" -) else ( - echo ==^> Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Installing "%SEVENZIP_PATH%" msiexec /qb /i "%SEVENZIP_PATH%" @@ -85,6 +80,8 @@ goto :eof :::::::::::: echo "%PACKER_BUILDER_TYPE%" | findstr /i "vmware" >nul if not errorlevel 1 goto vmware +echo "%PACKER_BUILDER_TYPE%" | findstr /i "vsphere" >nul +if not errorlevel 1 goto vmware echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul if not errorlevel 1 goto virtualbox echo "%PACKER_BUILDER_TYPE%" | findstr /i "parallels" >nul @@ -124,12 +121,8 @@ if defined VMWARE_TOOLS_ISO_PATH for %%i in (%VMWARE_TOOLS_ISO_PATH%) do set _VM if %_VMWARE_TOOLS_SIZE% EQU 0 set VMWARE_TOOLS_ISO_PATH= if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" -) else ( - echo ==^> Downloading "%VMWARE_TOOLS_TAR_URL%" to "%VMWARE_TOOLS_TAR_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VMWARE_TOOLS_TAR_URL%', '%VMWARE_TOOLS_TAR_PATH%')" Downloading "%VBOX_ISO_URL%" to "%VBOX_ISO_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VBOX_ISO_URL%', '%VBOX_ISO_PATH%')"