Use ttyS1 as default

Author: simcod

pixiecore/http.go

@@ -196,8 +196,8 @@ func ipxeScript(mach Machine, spec *Spec, serverHost string) ([]byte, error) {
 	urlTemplate := fmt.Sprintf("http://%s/_/file?name=%%s&type=%%s&mac=%%s", serverHost)
 	var b bytes.Buffer
 	b.WriteString("#!ipxe\n")
-	b.WriteString("set console ttyS0\n")
-	b.WriteString("iseq ${manufacturer} Supermicro && set console ttyS1 ||\n")
+	b.WriteString("set console ttyS1\n")
+	b.WriteString("iseq ${manufacturer} :Dell\\ Inc. && set console ttyS0 ||\n")
 	u := fmt.Sprintf(urlTemplate, url.QueryEscape(string(spec.Kernel)), "kernel", url.QueryEscape(mach.MAC.String()))
 	fmt.Fprintf(&b, "kernel --name kernel %s\n", u)
 	for i, initrd := range spec.Initrd {

pixiecore/http_test.go

@@ -66,8 +66,8 @@ func TestIpxe(t *testing.T) {
 	}
 
 	expected := `#!ipxe
-set console ttyS0
-iseq ${manufacturer} Supermicro && set console ttyS1 ||
+set console ttyS1
+iseq ${manufacturer} :Dell\ Inc. && set console ttyS0 ||
 kernel --name kernel http://localhost:1234/_/file?name=k-01%3A02%3A03%3A04%3A05%3A06-0&type=kernel&mac=01%3A02%3A03%3A04%3A05%3A06
 initrd --name initrd0 http://localhost:1234/_/file?name=i1-01%3A02%3A03%3A04%3A05%3A06-0&type=initrd&mac=01%3A02%3A03%3A04%3A05%3A06
 initrd --name initrd1 http://localhost:1234/_/file?name=i2-01%3A02%3A03%3A04%3A05%3A06-0&type=initrd&mac=01%3A02%3A03%3A04%3A05%3A06
@@ -93,8 +93,8 @@ boot kernel initrd=initrd0 initrd=initrd1 console=${console},115200n8 thing=http
 	}
 
 	expected = `#!ipxe
-set console ttyS0
-iseq ${manufacturer} Supermicro && set console ttyS1 ||
+set console ttyS1
+iseq ${manufacturer} :Dell\ Inc. && set console ttyS0 ||
 kernel --name kernel http://localhost:1234/_/file?name=k-fe%3Afe%3Afe%3Afe%3Afe%3Afe-1&type=kernel&mac=fe%3Afe%3Afe%3Afe%3Afe%3Afe
 initrd --name initrd0 http://localhost:1234/_/file?name=i1-fe%3Afe%3Afe%3Afe%3Afe%3Afe-1&type=initrd&mac=fe%3Afe%3Afe%3Afe%3Afe%3Afe
 initrd --name initrd1 http://localhost:1234/_/file?name=i2-fe%3Afe%3Afe%3Afe%3Afe%3Afe-1&type=initrd&mac=fe%3Afe%3Afe%3Afe%3Afe%3Afe