github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 02:51:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2737 from justincormack/packet-console

Browse Source 
Only add in ttyS1 to kernel cmdline on Packet if not there already
This commit is contained in:
Justin Cormack 2017-11-15 16:57:43 +00:00 committed by GitHub
commit ebbbc1b5fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/linuxkit/run_packet.go
View File

@ -14,6 +14,7 @@ import (
"os/user"
"path"
"path/filepath"
"strings"
"time"
"github.com/packethost/packngo"
@ -129,7 +130,12 @@ func runPacket(args []string) {
userData += "dhcp\n"
userData += fmt.Sprintf("set base-url %s\n", url)
if *machineFlag != "baremetal_2a" {
userData += fmt.Sprintf("set kernel-params ip=dhcp nomodeset ro serial console=ttyS1,115200 %s\n", cmdline)
var tty string
// x86_64 Packet machines have console on non standard ttyS1 which is not in most examples
if !strings.Contains(cmdline, "console=ttyS1") {
tty = "console=ttyS1,115200"
}
userData += fmt.Sprintf("set kernel-params ip=dhcp nomodeset ro serial %s %s\n", tty, cmdline)
userData += fmt.Sprintf("kernel ${base-url}/%s-kernel ${kernel-params}\n", name)
userData += fmt.Sprintf("initrd ${base-url}/%s-initrd.img\n", name)
} else {