From 2eafb03f162e7bebcd85d91baee41f763b485721 Mon Sep 17 00:00:00 2001 From: Andreas Kohn Date: Fri, 20 Jun 2014 14:13:53 +0200 Subject: [PATCH 1/3] Update to CentOS 6.5 --- website/source/docs/builders/qemu.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index 882aab816..e333ed933 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -27,8 +27,8 @@ paths to files, URLS for ISOs and checksums. [ { "type": "qemu", - "iso_url": "http://mirror.raystedman.net/centos/6/isos/x86_64/CentOS-6.4-x86_64-minimal.iso", - "iso_checksum": "4a5fa01c81cc300f4729136e28ebe600", + "iso_url": "http://mirror.raystedman.net/centos/6/isos/x86_64/CentOS-6.5-x86_64-minimal.iso", + "iso_checksum": "0d9dc37b5dd4befa1c440d2174e88a87", "iso_checksum_type": "md5", "output_directory": "output_centos_tdhtest", "ssh_wait_timeout": "30s", From 792c8ac964b282307b0af6b30bd1aac901a53cc2 Mon Sep 17 00:00:00 2001 From: Andreas Kohn Date: Fri, 20 Jun 2014 14:14:15 +0200 Subject: [PATCH 2/3] Improve the boot command sequence Use a single command line, avoid the graphical installer, and use {{ .HTTPIP }} rather than the actual IP. Also wait a bit before entering the commands to increase the chance of actually being in the boot menu. --- website/source/docs/builders/qemu.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index e333ed933..2d29adc05 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -49,10 +49,10 @@ paths to files, URLS for ISOs and checksums. "vm_name": "tdhtest", "net_device": "virtio-net", "disk_interface": "virtio", + "boot_wait": "5s", "boot_command": [ - "", - " ks=http://10.0.2.2:{{ .HTTPPort }}/centos6-ks.cfg" + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos6-ks.cfg" ] } ] From baa9fb9b7668b38ffd8f494080730b6a2563b0e6 Mon Sep 17 00:00:00 2001 From: Andreas Kohn Date: Fri, 20 Jun 2014 14:16:35 +0200 Subject: [PATCH 3/3] Update the kickstart link Instead of pointing at a specific (in this case actually non-working!) revision, point to the github UI for the head revision. The user is expected to find the 'raw' link there, but the page allows to also quickly look at changes etc, which might be helpful for people unfamiliar with kickstart files. --- website/source/docs/builders/qemu.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index 2d29adc05..2430c737f 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -60,7 +60,7 @@ paths to files, URLS for ISOs and checksums. A working CentOS 6.x kickstart file can be found -[at this URL](https://gist.github.com/mitchellh/7328271/raw/c91e0c4fa19c171a40b016c6c8f251f90d2ad0ba/centos6-ks.cfg), adapted from an unknown source. +[at this URL](https://gist.github.com/mitchellh/7328271/#file-centos6-ks-cfg), adapted from an unknown source. Place this file in the http directory with the proper name. For the example above, it should go into "httpdir" with a name of "centos6-ks.cfg".