Fix #94 Build timeout

juadde · shibumi · commit 18c6ed167084 · 2020-02-29T13:31:59.000+01:00
diff --git a/local.json b/local.json
@@ -45,7 +45,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }, {
             "type": "qemu",
@@ -74,7 +74,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }, {
             "type": "vmware-iso",
@@ -95,7 +95,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }
 
diff --git a/vagrant.json b/vagrant.json
@@ -45,7 +45,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }, {
             "type": "qemu",
@@ -74,7 +74,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }, {
             "type": "vmware-iso",
@@ -95,7 +95,7 @@
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
-                "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
+                "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"
             ]
         }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"boot_command": [`
`46`	`46`	`"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",`
`47`	`47`	`"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",`
`48`		`- "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
	`48`	`+ "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
`49`	`49`	`]`
`50`	`50`	`}, {`
`51`	`51`	`"type": "qemu",`
`@@ -74,7 +74,7 @@`
`74`	`74`	`"boot_command": [`
`75`	`75`	`"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",`
`76`	`76`	`"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",`
`77`		`- "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
	`77`	`+ "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
`78`	`78`	`]`
`79`	`79`	`}, {`
`80`	`80`	`"type": "vmware-iso",`
`@@ -95,7 +95,7 @@`
`95`	`95`	`"boot_command": [`
`96`	`96`	`"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",`
`97`	`97`	`"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",`
`98`		`- "bash install.sh <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
	`98`	`+ "bash install.sh < <(cat install-{chroot,common}.sh) && systemctl reboot<enter>"`
`99`	`99`	`]`
`100`	`100`	`}`
`101`	`101`