Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup shutdown scripts #87

Merged
merged 4 commits into from
Oct 1, 2013
Merged

Cleanup shutdown scripts #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e156c70
removing the creation of shutdown files for CentOS builds
Sep 30, 2013
4321677
condensing vboxmanage value; removed shutdown file for debian boxes
Sep 30, 2013
40339e3
removing shutdown script from fedora
Sep 30, 2013
aa16342
removing shutdown scripts from ubuntu templates
Oct 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions packer/centos-5.9-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
"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",
"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"
},
Expand All @@ -45,7 +35,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",
Expand All @@ -66,7 +56,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",
Expand Down
20 changes: 5 additions & 15 deletions packer/centos-5.9-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
"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",
"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"
},
Expand All @@ -45,7 +35,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",
Expand All @@ -66,7 +56,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",
Expand Down
20 changes: 5 additions & 15 deletions packer/centos-6.4-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
"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",
"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"
},
Expand All @@ -45,7 +35,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",
Expand All @@ -66,7 +56,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",
Expand Down
20 changes: 5 additions & 15 deletions packer/centos-6.4-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
"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",
"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"
},
Expand All @@ -45,7 +35,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",
Expand All @@ -66,7 +56,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",
Expand Down
20 changes: 5 additions & 15 deletions packer/debian-6.0.7-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
},
{
Expand Down Expand Up @@ -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",
Expand All @@ -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}}'"
}
]
}
18 changes: 4 additions & 14 deletions packer/debian-6.0.7-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
},
{
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 4 additions & 14 deletions packer/debian-7.1.0-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
},
{
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 4 additions & 14 deletions packer/debian-7.1.0-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
},
{
Expand Down Expand Up @@ -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",
Expand Down
25 changes: 5 additions & 20 deletions packer/fedora-18-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,15 @@
"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",
"512"
],
[
"modifyvm",
"{{.Name}}",
"--cpus",
"1"
]
[ "modifyvm", "{{.Name}}", "--memory", "512" ],
[ "modifyvm", "{{.Name}}", "--cpus", "1" ]
],
"virtualbox_version_file": ".vbox_version"
},
Expand All @@ -45,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",
Expand All @@ -68,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",
Expand Down
Loading