From bc90a3f60517d802c778726f072f0d1ec6f52e7d Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Sun, 9 Feb 2014 22:23:31 -0300 Subject: [PATCH 1/6] Use same preseed file for all Debian 7 releases The files were and most probably always should be identical. --- packer/debian-7.2.0-amd64.json | 4 +- packer/debian-7.2.0-i386.json | 4 +- packer/debian-7.3.0-amd64.json | 4 +- packer/debian-7.3.0-i386.json | 4 +- packer/http/debian-7.3.0/preseed.cfg | 48 ------------------- .../{debian-7.2.0 => debian-7}/preseed.cfg | 0 6 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 packer/http/debian-7.3.0/preseed.cfg rename packer/http/{debian-7.2.0 => debian-7}/preseed.cfg (100%) diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index e398380ec..5567a6980 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -4,7 +4,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", @@ -54,7 +54,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index e4617d110..41ec55f63 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -4,7 +4,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", @@ -54,7 +54,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.2.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 1b7c87094..54b189b97 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -9,7 +9,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", @@ -49,7 +49,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 0593c5faf..2fc8cc1a6 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -9,7 +9,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", @@ -49,7 +49,7 @@ "boot_command": [ "", "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7.3.0/preseed.cfg ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", "debian-installer=en_US ", "auto ", "locale=en_US ", diff --git a/packer/http/debian-7.3.0/preseed.cfg b/packer/http/debian-7.3.0/preseed.cfg deleted file mode 100644 index ced8699d2..000000000 --- a/packer/http/debian-7.3.0/preseed.cfg +++ /dev/null @@ -1,48 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make nfs-common -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/packer/http/debian-7.2.0/preseed.cfg b/packer/http/debian-7/preseed.cfg similarity index 100% rename from packer/http/debian-7.2.0/preseed.cfg rename to packer/http/debian-7/preseed.cfg From d58fe824107560f4c0f68f53fc44004cf1b2a7e0 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Sun, 9 Feb 2014 22:02:21 -0300 Subject: [PATCH 2/6] Add packer templates for Debian 7.4 --- packer/debian-7.4.0-amd64.json | 112 +++++++++++++++++++++++++++++++++ packer/debian-7.4.0-i386.json | 112 +++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 packer/debian-7.4.0-amd64.json create mode 100644 packer/debian-7.4.0-i386.json diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4.0-amd64.json new file mode 100644 index 000000000..0fdb59263 --- /dev/null +++ b/packer/debian-7.4.0-amd64.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "", + "install ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", + "debian-installer=en_US ", + "auto ", + "locale=en_US ", + "kbd-chooser/method=us ", + "keyboard-configuration/xkb-keymap=us ", + "netcfg/get_hostname={{ .Name }} ", + "netcfg/get_domain=vagrantup.com ", + "fb=false ", + "debconf/frontend=noninteractive ", + "console-setup/ask_detect=false ", + "console-keymaps-at/keymap=us ", + "" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "", + "install ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", + "debian-installer=en_US ", + "auto ", + "locale=en_US ", + "kbd-chooser/method=us ", + "keyboard-configuration/xkb-keymap=us ", + "netcfg/get_hostname={{ .Name }} ", + "netcfg/get_domain=vagrantup.com ", + "fb=false ", + "debconf/frontend=noninteractive ", + "console-setup/ask_detect=false ", + "console-keymaps-at/keymap=us ", + "" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5-64", + "http_directory": "http", + "iso_checksum": "d68c40dfdca601f912c0f1ae991cdb439d1c572e", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.4.0_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4.0-i386.json new file mode 100644 index 000000000..60c1712ca --- /dev/null +++ b/packer/debian-7.4.0-i386.json @@ -0,0 +1,112 @@ +{ + "variables": { + "chef_version": "provisionerless", + "mirror": "http://cdimage.debian.org/debian-cd" + }, + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "", + "install ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", + "debian-installer=en_US ", + "auto ", + "locale=en_US ", + "kbd-chooser/method=us ", + "keyboard-configuration/xkb-keymap=us ", + "netcfg/get_hostname={{ .Name }} ", + "netcfg/get_domain=vagrantup.com ", + "fb=false ", + "debconf/frontend=noninteractive ", + "console-setup/ask_detect=false ", + "console-keymaps-at/keymap=us ", + "" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "Debian", + "http_directory": "http", + "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vm_name": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386", + "vboxmanage": [ + [ "modifyvm", "{{.Name}}", "--memory", "384" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] + ] + }, + { + "type": "vmware-iso", + "boot_command": [ + "", + "install ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", + "debian-installer=en_US ", + "auto ", + "locale=en_US ", + "kbd-chooser/method=us ", + "keyboard-configuration/xkb-keymap=us ", + "netcfg/get_hostname={{ .Name }} ", + "netcfg/get_domain=vagrantup.com ", + "fb=false ", + "debconf/frontend=noninteractive ", + "console-setup/ask_detect=false ", + "console-keymaps-at/keymap=us ", + "" + ], + "boot_wait": "10s", + "disk_size": 40960, + "guest_os_type": "debian5", + "http_directory": "http", + "iso_checksum": "b6daf1584bf9e7748ebd160b09745984c244c3bb", + "iso_checksum_type": "sha1", + "iso_url": "{{user `mirror`}}/7.4.0/i386/iso-cd/debian-7.4.0-i386-CD-1.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", + "tools_upload_flavor": "linux", + "vm_name": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386", + "vmx_data": { + "memsize": "384", + "numvcpus": "1", + "cpuid.coresPerSocket": "1" + } + } + ], + "post-processors": [ + { + "type": "vagrant", + "output": "../builds/{{.Provider}}/opscode_debian-7.4.0-i386_chef-{{user `chef_version`}}.box" + } + ], + "provisioners": [ + { + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/debian/update.sh", + "scripts/common/sshd.sh", + "scripts/debian/networking.sh", + "scripts/debian/sudoers.sh", + "scripts/common/vagrant.sh", + "scripts/common/vmtools.sh", + "scripts/common/chef.sh", + "scripts/debian/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell", + "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] + } + ] +} From c28b4266af9be730ba506ac2c70e19c52e8b9bc9 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Sun, 9 Feb 2014 22:11:37 -0300 Subject: [PATCH 3/6] Update Debian 7.2 and 7.3 default mirror URLs They are now archived after Debian 7.4 release. --- packer/debian-7.2.0-amd64.json | 2 +- packer/debian-7.2.0-i386.json | 2 +- packer/debian-7.3.0-amd64.json | 2 +- packer/debian-7.3.0-i386.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json index 5567a6980..888af6956 100644 --- a/packer/debian-7.2.0-amd64.json +++ b/packer/debian-7.2.0-amd64.json @@ -119,7 +119,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json index 41ec55f63..fa4dc0c75 100644 --- a/packer/debian-7.2.0-i386.json +++ b/packer/debian-7.2.0-i386.json @@ -119,7 +119,7 @@ ], "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" } } diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 54b189b97..36bc9cc47 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 2fc8cc1a6..3276c5540 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -1,7 +1,7 @@ { "variables": { "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/debian-cd" + "mirror": "http://cdimage.debian.org/cdimage/archive" }, "builders": [ { From 1da291b41088d9c8e74103a8e86f2981ead10e51 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Mon, 10 Feb 2014 01:12:25 -0300 Subject: [PATCH 4/6] Use builder specific output directories also for Debian 7.3 and 7.4 --- packer/debian-7.3.0-amd64.json | 4 ++-- packer/debian-7.3.0-i386.json | 4 ++-- packer/debian-7.4.0-amd64.json | 4 ++-- packer/debian-7.4.0-i386.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json index 36bc9cc47..600481fe5 100644 --- a/packer/debian-7.3.0-amd64.json +++ b/packer/debian-7.3.0-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64", + "output_directory": "packer-debian-7.3.0-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json index 3276c5540..d12e99630 100644 --- a/packer/debian-7.3.0-i386.json +++ b/packer/debian-7.3.0-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386", + "output_directory": "packer-debian-7.3.0-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4.0-amd64.json index 0fdb59263..8174501ec 100644 --- a/packer/debian-7.4.0-amd64.json +++ b/packer/debian-7.4.0-amd64.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64", + "output_directory": "packer-debian-7.4.0-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4.0-i386.json index 60c1712ca..4d7092a45 100644 --- a/packer/debian-7.4.0-i386.json +++ b/packer/debian-7.4.0-i386.json @@ -38,7 +38,7 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -77,7 +77,7 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386", + "output_directory": "packer-debian-7.4.0-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", From 3440f08acc799011f50e58db8d58927327bc5f9f Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Mon, 10 Feb 2014 19:24:10 -0300 Subject: [PATCH 5/6] Remove old Debian 7 update releases --- packer/debian-7.2.0-amd64.json | 125 --------------------------------- packer/debian-7.2.0-i386.json | 125 --------------------------------- packer/debian-7.3.0-amd64.json | 112 ----------------------------- packer/debian-7.3.0-i386.json | 112 ----------------------------- 4 files changed, 474 deletions(-) delete mode 100644 packer/debian-7.2.0-amd64.json delete mode 100644 packer/debian-7.2.0-i386.json delete mode 100644 packer/debian-7.3.0-amd64.json delete mode 100644 packer/debian-7.3.0-i386.json diff --git a/packer/debian-7.2.0-amd64.json b/packer/debian-7.2.0-amd64.json deleted file mode 100644 index 888af6956..000000000 --- a/packer/debian-7.2.0-amd64.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.2.0-amd64-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-amd64" - }, - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "c7c1e2bf7ec4760b9fecf77fefa6062b73330359", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-CD-1.iso", - "output_directory": "packer-debian-7.2.0-amd64-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-7.2.0-amd64", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } -} - diff --git a/packer/debian-7.2.0-i386.json b/packer/debian-7.2.0-i386.json deleted file mode 100644 index fa4dc0c75..000000000 --- a/packer/debian-7.2.0-i386.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.2.0-i386-virtualbox", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "384" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.2.0-i386" - }, - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "011d42505fdafeb9be2bd0379a12d4042f24cfd5", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.2.0/i386/iso-cd/debian-7.2.0-i386-CD-1.iso", - "output_directory": "packer-debian-7.2.0-i386-vmware", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "tools_upload_flavor": "linux", - "type": "vmware-iso", - "vm_name": "packer-debian-7.2.0-i386", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "384", - "numvcpus": "1" - } - } - ], - "post-processors": [ - { - "output": "../builds/{{.Provider}}/opscode_debian-7.2.0-i386_chef-{{user `chef_version`}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - } -} - diff --git a/packer/debian-7.3.0-amd64.json b/packer/debian-7.3.0-amd64.json deleted file mode 100644 index 600481fe5..000000000 --- a/packer/debian-7.3.0-amd64.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, - "builders": [ - { - "type": "virtualbox-iso", - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian_64", - "http_directory": "http", - "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64-virtualbox", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5-64", - "http_directory": "http", - "iso_checksum": "5efcbf9f1b7b38915e86ff79be2157989e4e70e7", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.3.0-amd64", - "output_directory": "packer-debian-7.3.0-amd64-vmware", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - } - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.3.0_chef-{{user `chef_version`}}.box" - } - ], - "provisioners": [ - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] - } - ] -} diff --git a/packer/debian-7.3.0-i386.json b/packer/debian-7.3.0-i386.json deleted file mode 100644 index d12e99630..000000000 --- a/packer/debian-7.3.0-i386.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "variables": { - "chef_version": "provisionerless", - "mirror": "http://cdimage.debian.org/cdimage/archive" - }, - "builders": [ - { - "type": "virtualbox-iso", - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "Debian", - "http_directory": "http", - "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386-virtualbox", - "vboxmanage": [ - [ "modifyvm", "{{.Name}}", "--memory", "384" ], - [ "modifyvm", "{{.Name}}", "--cpus", "1" ] - ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US ", - "auto ", - "locale=en_US ", - "kbd-chooser/method=us ", - "keyboard-configuration/xkb-keymap=us ", - "netcfg/get_hostname={{ .Name }} ", - "netcfg/get_domain=vagrantup.com ", - "fb=false ", - "debconf/frontend=noninteractive ", - "console-setup/ask_detect=false ", - "console-keymaps-at/keymap=us ", - "" - ], - "boot_wait": "10s", - "disk_size": 40960, - "guest_os_type": "debian5", - "http_directory": "http", - "iso_checksum": "ed2d36bcf660f8f6d6ca7318f58ed2ba2f75160a", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/7.3.0/i386/iso-cd/debian-7.3.0-i386-CD-1.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.3.0-i386", - "output_directory": "packer-debian-7.3.0-i386-vmware", - "vmx_data": { - "memsize": "384", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - } - } - ], - "post-processors": [ - { - "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.3.0-i386_chef-{{user `chef_version`}}.box" - } - ], - "provisioners": [ - { - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", - "scripts": [ - "scripts/debian/update.sh", - "scripts/common/sshd.sh", - "scripts/debian/networking.sh", - "scripts/debian/sudoers.sh", - "scripts/common/vagrant.sh", - "scripts/common/vmtools.sh", - "scripts/common/chef.sh", - "scripts/debian/cleanup.sh", - "scripts/common/minimize.sh" - ], - "type": "shell", - "environment_vars": [ "CHEF_VERSION={{user `chef_version`}}" ] - } - ] -} From fe632965df41e0a1e20e1524c978b2dde1313f28 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Mon, 10 Feb 2014 19:27:59 -0300 Subject: [PATCH 6/6] Rename Debian 7.4.0 to Debian 7.4 The official version is "7.4" even though the download URL uses the extra digit. --- .../{debian-7.4.0-amd64.json => debian-7.4-amd64.json} | 10 +++++----- .../{debian-7.4.0-i386.json => debian-7.4-i386.json} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename packer/{debian-7.4.0-amd64.json => debian-7.4-amd64.json} (91%) rename packer/{debian-7.4.0-i386.json => debian-7.4-i386.json} (91%) diff --git a/packer/debian-7.4.0-amd64.json b/packer/debian-7.4-amd64.json similarity index 91% rename from packer/debian-7.4.0-amd64.json rename to packer/debian-7.4-amd64.json index 8174501ec..5fce3b87c 100644 --- a/packer/debian-7.4.0-amd64.json +++ b/packer/debian-7.4-amd64.json @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64-virtualbox", + "vm_name": "packer-debian-7.4-amd64", + "output_directory": "packer-debian-7.4-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -76,8 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4.0-amd64", - "output_directory": "packer-debian-7.4.0-amd64-vmware", + "vm_name": "packer-debian-7.4-amd64", + "output_directory": "packer-debian-7.4-amd64-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4.0_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.4_chef-{{user `chef_version`}}.box" } ], "provisioners": [ diff --git a/packer/debian-7.4.0-i386.json b/packer/debian-7.4-i386.json similarity index 91% rename from packer/debian-7.4.0-i386.json rename to packer/debian-7.4-i386.json index 4d7092a45..7e80b00e5 100644 --- a/packer/debian-7.4.0-i386.json +++ b/packer/debian-7.4-i386.json @@ -37,8 +37,8 @@ "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386-virtualbox", + "vm_name": "packer-debian-7.4-i386", + "output_directory": "packer-debian-7.4-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "384" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -76,8 +76,8 @@ "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", "tools_upload_flavor": "linux", - "vm_name": "packer-debian-7.4.0-i386", - "output_directory": "packer-debian-7.4.0-i386-vmware", + "vm_name": "packer-debian-7.4-i386", + "output_directory": "packer-debian-7.4-i386-vmware", "vmx_data": { "memsize": "384", "numvcpus": "1", @@ -88,7 +88,7 @@ "post-processors": [ { "type": "vagrant", - "output": "../builds/{{.Provider}}/opscode_debian-7.4.0-i386_chef-{{user `chef_version`}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.4-i386_chef-{{user `chef_version`}}.box" } ], "provisioners": [