Repair FreeBSD definitions after they got corrupted by a Packer bug. (h…

…ashicorp/packer#784)
chef · Jan 3, 2014 · 24afa22 · 24afa22
1 parent ddd6ef7
commit 24afa22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packer/freebsd-9.2-amd64.json b/packer/freebsd-9.2-amd64.json
@@ -14,7 +14,7 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
@@ -63,7 +63,7 @@
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
         "<wait5>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
@@ -99,7 +99,7 @@
       "environment_vars": [
         "CHEF_VERSION={{user `chef_version`}}"
       ],
-      "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m",
+      "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m",
       "scripts": [
         "scripts/freebsd/postinstall.sh",
         "scripts/freebsd/vmtools.sh",

diff --git a/packer/freebsd-9.2-i386.json b/packer/freebsd-9.2-i386.json
@@ -14,7 +14,7 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
@@ -63,7 +63,7 @@
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
         "<wait5>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh \u0026\u0026 chmod +x /tmp/install.sh \u0026\u0026 /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-9.2/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
@@ -96,7 +96,7 @@
   ],
   "provisioners": [
     {
-      "execute_command": "export {{.Vars}} \u0026\u0026 cat {{.Path}} | su -m",
+      "execute_command": "export {{.Vars}} && cat {{.Path}} | su -m",
       "scripts": [
         "scripts/freebsd/postinstall.sh",
         "scripts/freebsd/vmtools.sh",