Write ttyS0

Author: simcod

pixiecore/booters.go

@@ -115,7 +115,6 @@ func (g *grpcbooter) BootSpec(m Machine) (*Spec, error) {
 		if g.config.Debug {
 			cmdline = append(cmdline, "DEBUG=1")
 		}
-		cmdline = append(cmdline, "console=ttyS0,115200n8")
 
 		r = rawSpec{
 			Kernel:  resp.GetKernel(),

pixiecore/http.go

@@ -196,9 +196,6 @@ 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} \"Dell Inc.\" && set console ttyS0\n")
-	b.WriteString("iseq ${manufacturer} \"Supermicro\" && set console ttyS1\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 {
@@ -222,7 +219,7 @@ func ipxeScript(mach Machine, spec *Spec, serverHost string) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("expanding cmdline %q: %w", spec.Cmdline, err)
 	}
-	// b.WriteString("console=ttyS0,115200n8 ")
+	b.WriteString("console=ttyS0,115200n8 ")
 	b.WriteString(cmdline)
 	b.WriteByte('\n')
 

pixiecore/http_test.go

@@ -66,15 +66,12 @@ func TestIpxe(t *testing.T) {
 	}
 
 	expected := `#!ipxe
-set console ttyS0
-iseq ${manufacturer} "Dell Inc." && set console ttyS0
-iseq ${manufacturer} "Supermicro" && set console ttyS1
 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
 imgfetch --name ready http://localhost:1234/_/booting?mac=01%3A02%3A03%3A04%3A05%3A06 ||
 imgfree ready ||
-boot kernel initrd=initrd0 initrd=initrd1 thing=http://localhost:1234/_/file?name=f-01%3A02%3A03%3A04%3A05%3A06-0 foo=bar
+boot kernel initrd=initrd0 initrd=initrd1 console=ttyS0,115200n8 thing=http://localhost:1234/_/file?name=f-01%3A02%3A03%3A04%3A05%3A06-0 foo=bar
 `
 	if rr.Body.String() != expected {
 		t.Fatalf("Wrong iPXE script\nwant: %s\ngot:  %s", expected, rr.Body.String())
@@ -94,15 +91,12 @@ boot kernel initrd=initrd0 initrd=initrd1 thing=http://localhost:1234/_/file?nam
 	}
 
 	expected = `#!ipxe
-set console ttyS0
-iseq ${manufacturer} "Dell Inc." && set console ttyS0
-iseq ${manufacturer} "Supermicro" && set console ttyS1
 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
 imgfetch --name ready http://localhost:1234/_/booting?mac=fe%3Afe%3Afe%3Afe%3Afe%3Afe ||
 imgfree ready ||
-boot kernel initrd=initrd0 initrd=initrd1 thing=http://localhost:1234/_/file?name=f-fe%3Afe%3Afe%3Afe%3Afe%3Afe-1 foo=bar
+boot kernel initrd=initrd0 initrd=initrd1 console=ttyS0,115200n8 thing=http://localhost:1234/_/file?name=f-fe%3Afe%3Afe%3Afe%3Afe%3Afe-1 foo=bar
 `
 	if rr.Body.String() != expected {
 		t.Fatalf("Wrong iPXE script\nwant: %s\ngot:  %s", expected, rr.Body.String())