From e156c70c5c948f59b8deabcc135d84a41da8bc99 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Mon, 30 Sep 2013 17:32:34 -0500 Subject: [PATCH 1/4] removing the creation of shutdown files for CentOS builds --- packer/centos-5.9-i386.json | 6 +++--- packer/centos-5.9-x86_64.json | 6 +++--- packer/centos-6.4-i386.json | 6 +++--- packer/centos-6.4-x86_64.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index ae4255d2d..e9833c8d3 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -12,7 +12,7 @@ "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "78f976b190ce44716eb672f71203df978474dfb4", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/i386/CentOS-5.9-i386-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index 9a915ce5e..a4c013445 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "c12e01b546f00a965b8414abf0860b08d0bba3c9", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/5.9/isos/x86_64/CentOS-5.9-x86_64-bin-DVD-1of2.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/vagrant.sh", "scripts/common/sshd.sh", diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index bbeab0efe..24cfe3b09 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -12,7 +12,7 @@ "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "4bd3a1de6f6dfcd7a2199487abf5a9304d696cae", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/i386/CentOS-6.4-i386-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 9cc5a8893..26bee72de 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -45,7 +45,7 @@ "iso_checksum": "8672dc087f1b0eda60b9efaa41b82f034f185e24", "iso_checksum_type": "sha1", "iso_url": "http://mirrors.kernel.org/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso", - "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -66,7 +66,7 @@ ], "provisioners": [ { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vagrant.sh", From 4321677c256f87883f0f43bd9c1c7311acb4a190 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Mon, 30 Sep 2013 17:50:28 -0500 Subject: [PATCH 2/4] condensing vboxmanage value; removed shutdown file for debian boxes --- packer/centos-5.9-i386.json | 14 ++------------ packer/centos-5.9-x86_64.json | 14 ++------------ packer/centos-6.4-i386.json | 14 ++------------ packer/centos-6.4-x86_64.json | 14 ++------------ packer/debian-6.0.7-amd64.json | 20 +++++--------------- packer/debian-6.0.7-i386.json | 18 ++++-------------- packer/debian-7.1.0-amd64.json | 18 ++++-------------- packer/debian-7.1.0-i386.json | 18 ++++-------------- packer/fedora-18-i386.json | 14 ++------------ packer/fedora-18-x86_64.json | 14 ++------------ packer/fedora-19-i386.json | 14 ++------------ packer/fedora-19-x86_64.json | 14 ++------------ packer/fedora-20-i386.json | 14 ++------------ packer/fedora-20-x86_64.json | 14 ++------------ packer/ubuntu-10.04-amd64.json | 14 ++------------ packer/ubuntu-10.04-i386.json | 14 ++------------ packer/ubuntu-12.04-amd64.json | 14 ++------------ packer/ubuntu-12.04-i386.json | 14 ++------------ packer/ubuntu-12.10-amd64.json | 14 ++------------ packer/ubuntu-12.10-i386.json | 14 ++------------ packer/ubuntu-13.04-amd64.json | 14 ++------------ packer/ubuntu-13.04-i386.json | 14 ++------------ 22 files changed, 53 insertions(+), 273 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index e9833c8d3..618c9efd5 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index a4c013445..4c18ad766 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index 24cfe3b09..b14aa69ba 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 26bee72de..6c8d887f3 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "480" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index cd68c5271..f03d89417 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -105,7 +95,7 @@ "scripts/debian/cleanup.sh", "scripts/common/minimize.sh" ], - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'" + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'" } ] } diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index ff3c32cb6..6b2a82f7e 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index 99d560862..eab546e0d 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index fb1626616..89937f0c7 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -30,22 +30,12 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { @@ -78,7 +68,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo '/sbin/shutdown -hP now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index b0dd14d05..0f071422b 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index f770047fc..6c6e221f3 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 06ca3f3aa..51a1f75cf 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index f700502cc..189547034 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index 4bae4cfee..badb8100e 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 995a018b7..860d5ea29 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -19,18 +19,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 956590a1b..a2d26a914 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 7e252f92e..de8eea1c0 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 7614296c6..cc2d0e68a 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -41,18 +41,8 @@ "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, { diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 44ecea303..57cfb9e93 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index f67208171..ad87d7064 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 0a3db5070..6a6ecd1e8 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 177e7f003..c10d5742b 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 3721eab15..94a894e41 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -40,18 +40,8 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" }, From 40339e3088270664306fb9d0adc362b8d852ba43 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Mon, 30 Sep 2013 18:40:58 -0500 Subject: [PATCH 3/4] removing shutdown script from fedora --- packer/fedora-18-i386.json | 13 ++++--------- packer/fedora-18-x86_64.json | 13 ++++--------- packer/fedora-19-i386.json | 13 ++++--------- packer/fedora-19-x86_64.json | 13 ++++--------- packer/fedora-20-i386.json | 13 ++++--------- packer/fedora-20-x86_64.json | 2 +- 6 files changed, 21 insertions(+), 46 deletions(-) diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 0f071422b..6148971a5 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "a22e6ab7b0e5e93397e4a1d8d994693d0afb9ad46b1f47a4fe10bfbbc2e7f354", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -58,12 +58,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 6c6e221f3..14b9fe7a8 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -12,14 +12,14 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "91c5f0aca391acf76a047e284144f90d66d3d5f5dcd26b01f368a43236832c03", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -58,12 +58,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 51a1f75cf..2024dd4dc 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 189547034..69dba152a 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -12,14 +12,14 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index badb8100e..f375a0d2f 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -12,14 +12,14 @@ "iso_checksum": "24e3a6446b7e2e2b0a3591271c896c41eae01f733a65aa4f5bf43e99bfcfc25e", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" @@ -35,7 +35,7 @@ "iso_checksum": "0da29695c4f503e2b27350406c1ceb7a4e5b9b699ea722774368fd16ab277bce", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -56,12 +56,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 860d5ea29..e4a8c528a 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -19,7 +19,7 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox", "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ], "virtualbox_version_file": ".vbox_version" From aa16342ddd7b3f1db433309e284c325ecfc3101e Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Mon, 30 Sep 2013 20:59:12 -0500 Subject: [PATCH 4/4] removing shutdown scripts from ubuntu templates --- packer/fedora-20-x86_64.json | 6 +++--- packer/ubuntu-10.04-amd64.json | 11 +++-------- packer/ubuntu-10.04-i386.json | 11 +++-------- packer/ubuntu-12.04-amd64.json | 11 +++-------- packer/ubuntu-12.04-i386.json | 11 +++-------- packer/ubuntu-12.10-amd64.json | 11 +++-------- packer/ubuntu-12.10-i386.json | 11 +++-------- packer/ubuntu-13.04-amd64.json | 11 +++-------- packer/ubuntu-13.04-i386.json | 6 +++--- 9 files changed, 27 insertions(+), 62 deletions(-) diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index e4a8c528a..500c42c0a 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -12,7 +12,7 @@ "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -35,7 +35,7 @@ "iso_checksum": "749763da40ebf6cb3a9ed46434b2d165d09938cf24b51992da656d9125ff0290", "iso_checksum_type": "sha256", "iso_url": "http://mirrors.kernel.org/fedora/releases/test/20-Alpha/Fedora/x86_64/iso/Fedora-20-Alpha-x86_64-DVD.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -61,7 +61,7 @@ "destination": "/tmp/shutdown.sh" }, { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ "scripts/common/sshd.sh", "scripts/common/vmtools.sh", diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index a2d26a914..1b08ca2ca 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "796e80702d65f2ee96e88874a1ab437e24df9cd6", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index de8eea1c0..774e7d03f 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "5695d8b6b914269d1374ac8d4c3dd3786e92d3fe", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/10.04.4/ubuntu-10.04.4-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index cc2d0e68a..82f74989c 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -37,7 +37,7 @@ "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ @@ -77,7 +77,7 @@ "iso_checksum": "983cfa31d1a376e0c6d2e431af7e0e5757f8d28a", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh 'shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant' | sudo -S bash '{{.Path}}'", + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 57cfb9e93..0b8235fc0 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "2ec0e913959f6c2ba7a558e8bfa361428bb00e56", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "f6fb4e12e12e6ba4247aee5985dd92cc5a653122", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.04/ubuntu-12.04.3-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index ad87d7064..78f6bb4d6 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "e2a48af008ff3c4db6a8235151a1e90ea600fceb", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 6a6ecd1e8..31da1e259 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "e0e48be7ae21003cf0b25591d71d8cdbee7063e7", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/12.10/ubuntu-12.10-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -100,12 +100,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index c10d5742b..33adfa05f 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -33,7 +33,7 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -78,7 +78,7 @@ "iso_checksum": "2af1c223f586f59237212bb9c06ad774673c8952", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-amd64.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -101,12 +101,7 @@ ], "provisioners": [ { - "type": "file", - "source": "scripts/common/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, - { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh", diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index 94a894e41..b990dad54 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -33,7 +33,7 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -77,7 +77,7 @@ "iso_checksum": "27bbe172d66d4ce634d10fd655e840f72fe56130", "iso_checksum_type": "sha1", "iso_url": "http://releases.ubuntu.com/13.04/ubuntu-13.04-server-i386.iso", - "shutdown_command": "echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", @@ -105,7 +105,7 @@ "destination": "/tmp/shutdown.sh" }, { - "execute_command": "echo 'vagrant'|sudo -S sh '{{.Path}}'", + "execute_command": "echo 'vagrant'|{{.Vars}} sudo -S -E bash '{{.Path}}'", "scripts": [ "scripts/ubuntu/update.sh", "scripts/common/sshd.sh",