From 22ee646f6cb5a3e5070ae1ddb8406690bcdd7758 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Thu, 13 Nov 2014 00:06:00 -0800 Subject: [PATCH 1/4] Update to 10.1 --- ...0.0-amd64.json => freebsd-10.1-amd64.json} | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename packer/{freebsd-10.0-amd64.json => freebsd-10.1-amd64.json} (87%) diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.1-amd64.json similarity index 87% rename from packer/freebsd-10.0-amd64.json rename to packer/freebsd-10.1-amd64.json index 371712997..674150e3e 100644 --- a/packer/freebsd-10.0-amd64.json +++ b/packer/freebsd-10.1-amd64.json @@ -39,9 +39,9 @@ "disk_size": 10140, "guest_os_type": "FreeBSD_64", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,8 +49,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-virtualbox", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-amd64-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -78,16 +78,16 @@ "disk_size": 10140, "guest_os_type": "freebsd-64", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-vmware", + "output_directory": "packer-freebsd-10.1-amd64-vmware", "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", @@ -116,9 +116,9 @@ "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109", + "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -127,7 +127,7 @@ "parallels_tools_mode": "disable", "prlctl_version_file": ".prlctl_version", "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-amd64-parallels", + "output_directory": "packer-freebsd-10.1-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "512" ], [ "set", "{{.Name}}", "--cpus", "1" ], @@ -139,7 +139,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" From f099fd422e9727bf96a15262b91dda9d6192a2f8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Thu, 13 Nov 2014 21:10:46 -0800 Subject: [PATCH 2/4] Update to FreeBSD 10.1 i386. --- ...-10.0-i386.json => freebsd-10.1-i386.json} | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) rename packer/{freebsd-10.0-i386.json => freebsd-10.1-i386.json} (82%) diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.1-i386.json similarity index 82% rename from packer/freebsd-10.0-i386.json rename to packer/freebsd-10.1-i386.json index 9f9c14b51..b83593549 100644 --- a/packer/freebsd-10.0-i386.json +++ b/packer/freebsd-10.1-i386.json @@ -33,15 +33,15 @@ "mdmfs -s 100m md1 /tmp", "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "FreeBSD", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -49,8 +49,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-freebsd-10.0-i386", - "output_directory": "packer-freebsd-10.0-i386-virtualbox", + "vm_name": "packer-freebsd-10.1-i386", + "output_directory": "packer-freebsd-10.1-i386-virtualbox", "vboxmanage": [ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] @@ -72,22 +72,22 @@ "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", "", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.0-i386", - "output_directory": "packer-freebsd-10.0-i386-vmware", + "vm_name": "packer-freebsd-10.1-i386", + "output_directory": "packer-freebsd-10.1-i386-vmware", "tools_upload_flavor": "freebsd", "vmx_data": { "memsize": "512", @@ -110,15 +110,15 @@ "mdmfs -s 100m md1 /tmp", "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, "guest_os_type": "freebsd", "http_directory": "http", - "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc", + "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso", + "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso", "ssh_username": "vagrant", "ssh_password": "vagrant", "ssh_port": 22, @@ -126,8 +126,8 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "parallels_tools_mode": "disable", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.0-amd64", - "output_directory": "packer-freebsd-10.0-i386-parallels", + "vm_name": "packer-freebsd-10.1-amd64", + "output_directory": "packer-freebsd-10.1-i386-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "512" ], [ "set", "{{.Name}}", "--cpus", "1" ], @@ -139,7 +139,7 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box", "override": { "parallels": { "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" From db2bdea42159c3c3f31c1b4ae4d8495cd30db040 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Thu, 13 Nov 2014 21:14:41 -0800 Subject: [PATCH 3/4] Missed some 10.0 -> 10.1 references --- packer/freebsd-10.1-amd64.json | 10 +++++----- packer/http/{freebsd-10.0 => freebsd-10.1}/install.sh | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename packer/http/{freebsd-10.0 => freebsd-10.1}/install.sh (100%) diff --git a/packer/freebsd-10.1-amd64.json b/packer/freebsd-10.1-amd64.json index 674150e3e..96adc6320 100644 --- a/packer/freebsd-10.1-amd64.json +++ b/packer/freebsd-10.1-amd64.json @@ -33,7 +33,7 @@ "mdmfs -s 100m md1 /tmp", "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, @@ -72,7 +72,7 @@ "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", "", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, @@ -86,7 +86,7 @@ "ssh_port": 22, "ssh_wait_timeout": "10000s", "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-freebsd-10.0-amd64", + "vm_name": "packer-freebsd-10.1-amd64", "output_directory": "packer-freebsd-10.1-amd64-vmware", "tools_upload_flavor": "freebsd", "vmx_data": { @@ -110,7 +110,7 @@ "mdmfs -s 100m md1 /tmp", "mdmfs -s 100m md2 /mnt", "dhclient -l /tmp/dhclient.lease.em0 em0", - "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "10s", "disk_size": 10140, @@ -126,7 +126,7 @@ "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", "parallels_tools_mode": "disable", "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-freebsd-10.0-amd64", + "vm_name": "packer-freebsd-10.1-amd64", "output_directory": "packer-freebsd-10.1-amd64-parallels", "prlctl": [ [ "set", "{{.Name}}", "--memsize", "512" ], diff --git a/packer/http/freebsd-10.0/install.sh b/packer/http/freebsd-10.1/install.sh similarity index 100% rename from packer/http/freebsd-10.0/install.sh rename to packer/http/freebsd-10.1/install.sh From 3dc2c0222720d7b7844694c23fa8fcc0e335c5a8 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Fri, 14 Nov 2014 07:58:47 -0800 Subject: [PATCH 4/4] Newer FreeBSDs don't need to load geom_mbr and zfs explicitly; it's already built in ASSUME_ALWAYS_YES takes a boolean, not an integer now --- packer/freebsd-10.1-amd64.json | 12 ------------ packer/freebsd-10.1-i386.json | 12 ------------ packer/scripts/freebsd/postinstall.sh | 11 +---------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/packer/freebsd-10.1-amd64.json b/packer/freebsd-10.1-amd64.json index 96adc6320..7fe1ff679 100644 --- a/packer/freebsd-10.1-amd64.json +++ b/packer/freebsd-10.1-amd64.json @@ -22,10 +22,6 @@ "type": "virtualbox-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", @@ -60,10 +56,6 @@ "type": "vmware-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", @@ -99,10 +91,6 @@ "type": "parallels-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", diff --git a/packer/freebsd-10.1-i386.json b/packer/freebsd-10.1-i386.json index b83593549..e02514985 100644 --- a/packer/freebsd-10.1-i386.json +++ b/packer/freebsd-10.1-i386.json @@ -22,10 +22,6 @@ "type": "virtualbox-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", @@ -60,10 +56,6 @@ "type": "vmware-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", @@ -99,10 +91,6 @@ "type": "parallels-iso", "boot_command": [ "", - "load geom_mbr", - "", - "load zfs", - "", "boot -s", "", "", diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh index b18744af3..195bcedff 100644 --- a/packer/scripts/freebsd/postinstall.sh +++ b/packer/scripts/freebsd/postinstall.sh @@ -18,7 +18,7 @@ env PAGER=/bin/cat /tmp/freebsd-update install #Install sudo, curl and ca_root_nss if [ $freebsd_major -gt 9 ]; then # Use pkgng - env ASSUME_ALWAYS_YES=1 pkg bootstrap + env ASSUME_ALWAYS_YES=true pkg bootstrap pkg update pkg install -y sudo pkg install -y curl @@ -58,12 +58,3 @@ EOT pw groupadd vboxusers pw groupmod vboxusers -m vagrant -echo "==============================================================================" -echo "NOTE: FreeBSD - Vagrant" -echo "When using this basebox you need to do some special stuff in your Vagrantfile" -echo "1) Enable HostOnly network" -echo ' config.vm.network "private_network", ip: "192.168.33.10"' -echo "2) Use nfs instead of shared folders" -echo ' config.vm.synced_folder "v-root", "/vagrant", :nfs => true' -echo "=============================================================================" -exit