diff --git a/debian/debian-7.11-amd64.json b/debian/debian-7.11-amd64.json deleted file mode 100644 index 0e4d83d62..000000000 --- a/debian/debian-7.11-amd64.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian_64", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-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", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_os_type": "debian7-64", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-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": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.11", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "cbae9d679dbe2d37828a5abb9d3ea8c40183972952180843d8b07f7b33e09877", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.11.0-amd64-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.11.0/amd64/iso-cd", - "name": "debian-7.11", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.11-amd64", - "version": "TIMESTAMP" - } -} - diff --git a/debian/debian-7.11-i386.json b/debian/debian-7.11-i386.json deleted file mode 100644 index e9542db8b..000000000 --- a/debian/debian-7.11-i386.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "builders": [ - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", - "guest_os_type": "Debian", - "hard_drive_interface": "sata", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-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", - "{{ user `memory` }}" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "virtualbox_version_file": ".vbox_version", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_os_type": "debian7", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-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": "{{ user `template` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - }, - "vmx_remove_ethernet_interfaces": true - }, - { - "boot_command": [ - "", - "install ", - " preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "guest_os_type": "debian", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-parallels", - "parallels_tools_flavor": "lin", - "prlctl": [ - [ - "set", - "{{.Name}}", - "--memsize", - "{{ user `memory` }}" - ], - [ - "set", - "{{.Name}}", - "--cpus", - "{{ user `cpus` }}" - ] - ], - "prlctl_version_file": ".prlctl_version", - "shutdown_command": "echo 'vagrant' | sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "{{ user `template` }}" - }, - { - "boot_command": [ - "", - "install ", - "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-7/preseed.cfg ", - "debian-installer=en_US.UTF-8 ", - "auto ", - "locale=en_US.UTF-8 ", - "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": "{{user `disk_size`}}", - "headless": "{{ user `headless` }}", - "http_directory": "http", - "iso_checksum": "{{user `iso_checksum`}}", - "iso_checksum_type": "{{user `iso_checksum_type`}}", - "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", - "output_directory": "../builds/packer-{{user `template`}}-qemu", - "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "qemu", - "vm_name": "{{ user `template` }}" - } - ], - "post-processors": [ - { - "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box", - "type": "vagrant" - } - ], - "provisioners": [ - { - "environment_vars": [ - "HOME_DIR=/home/vagrant", - "http_proxy={{user `http_proxy`}}", - "https_proxy={{user `https_proxy`}}", - "no_proxy={{user `no_proxy`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh -eux '{{.Path}}'", - "expect_disconnect": true, - "scripts": [ - "scripts/update.sh", - "../_common/sshd.sh", - "scripts/networking.sh", - "scripts/sudoers.sh", - "../_common/vagrant.sh", - "../_common/virtualbox.sh", - "../_common/vmware.sh", - "../_common/parallels.sh", - "scripts/cleanup.sh", - "../_common/minimize.sh" - ], - "type": "shell" - } - ], - "variables": { - "box_basename": "debian-7.11-i386", - "build_timestamp": "{{isotime \"20060102150405\"}}", - "cpus": "1", - "disk_size": "65536", - "git_revision": "__unknown_git_revision__", - "headless": "", - "http_proxy": "{{env `http_proxy`}}", - "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "9486d582a9d6cbce3e68dd8f8734425bea02dba9da5c484028e3c7f52ad28845", - "iso_checksum_type": "sha256", - "iso_name": "debian-7.11.0-i386-CD-1.iso", - "memory": "1024", - "mirror": "http://cdimage.debian.org/cdimage/archive", - "mirror_directory": "7.11.0/i386/iso-cd", - "name": "debian-7.11-i386", - "no_proxy": "{{env `no_proxy`}}", - "preseed_path": "debian-7/preseed.cfg", - "template": "debian-7.11-i386", - "version": "TIMESTAMP" - } -} - diff --git a/debian/http/debian-7/preseed.cfg b/debian/http/debian-7/preseed.cfg deleted file mode 100644 index d6191052e..000000000 --- a/debian/http/debian-7/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 httpredir.debian.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 1000 -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 cifs-utils -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select none -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/debian/scripts/sudoers.sh b/debian/scripts/sudoers.sh index 0e83852b7..00aa3b9f5 100644 --- a/debian/scripts/sudoers.sh +++ b/debian/scripts/sudoers.sh @@ -1,7 +1,6 @@ #!/bin/sh -eux -# Only add the secure path line if it is not already present - Debian 7 -# includes it by default. +# Only add the secure path line if it is not already present grep -q 'secure_path' /etc/sudoers \ || sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers;