diff --git a/distros/almalinux/9/amd64.pkrvars.hcl b/distros/almalinux/9/amd64.pkrvars.hcl index 83de82e..235dc15 100644 --- a/distros/almalinux/9/amd64.pkrvars.hcl +++ b/distros/almalinux/9/amd64.pkrvars.hcl @@ -8,6 +8,7 @@ boot_command = [ "e", "", " inst.text inst.ks=cdrom:/ks.cfg", + " console=ttyS0 inst.notmux", "x" ] cd_files = [ "distros/almalinux/9/disc/*" ] diff --git a/distros/alpine/3.19.0/amd64.pkrvars.hcl b/distros/alpine/3.19.0/amd64.pkrvars.hcl index 47936c3..894f4fd 100644 --- a/distros/alpine/3.19.0/amd64.pkrvars.hcl +++ b/distros/alpine/3.19.0/amd64.pkrvars.hcl @@ -16,4 +16,4 @@ boot_command = [ ] http_directory = "distros/alpine/3.19.0/http/" boot_wait = "20s" -shutdown_command = "sudo poweroff" \ No newline at end of file +shutdown_command = "sudo poweroff" diff --git a/distros/archlinux/rolling/amd64.pkrvars.hcl b/distros/archlinux/rolling/amd64.pkrvars.hcl index 395cab1..60f9fdb 100644 --- a/distros/archlinux/rolling/amd64.pkrvars.hcl +++ b/distros/archlinux/rolling/amd64.pkrvars.hcl @@ -5,7 +5,7 @@ iso = { checksum = "52aea58f88c9a80afe64f0536da868251ef4878de5a5e0227fcada9f132bd7ab" } boot_command = [ - "e net.ifnames=0 biosdevnames=0", + "e net.ifnames=0 biosdevnames=0 console=ttyS0", "", # Wait for system to come up? "curl -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/install.sh", "", diff --git a/distros/centos-stream/9/amd64.pkrvars.hcl.sh b/distros/centos-stream/9/amd64.pkrvars.hcl.sh index f0fa813..2e5c192 100755 --- a/distros/centos-stream/9/amd64.pkrvars.hcl.sh +++ b/distros/centos-stream/9/amd64.pkrvars.hcl.sh @@ -24,6 +24,7 @@ boot_command = [ "e", "", " inst.text inst.ks=cdrom:/ks.cfg", + " inst.notmux console=ttyS0", "x" ] cd_files = [ "distros/centos-stream/9/disc/*" ] diff --git a/distros/centos/7/amd64.pkrvars.hcl b/distros/centos/7/amd64.pkrvars.hcl index b553bb1..1926391 100644 --- a/distros/centos/7/amd64.pkrvars.hcl +++ b/distros/centos/7/amd64.pkrvars.hcl @@ -8,6 +8,7 @@ boot_command = [ "e", "", " inst.ks=cdrom:/ks.cfg", + " inst.notmux console=ttyS0", "x" ] cd_files = ["distros/centos/7/disc/*"] diff --git a/distros/debian/10/amd64.pkrvars.hcl b/distros/debian/10/amd64.pkrvars.hcl index 7a1aeb1..94d2556 100644 --- a/distros/debian/10/amd64.pkrvars.hcl +++ b/distros/debian/10/amd64.pkrvars.hcl @@ -16,6 +16,7 @@ boot_command = [ "debconf/frontend=noninteractive ", "hostname={{.Name}} ", "domain=vagrant ", + "console=ttyS0 ", "" ] http_directory = "distros/debian/10/http/" diff --git a/distros/debian/11/amd64.pkrvars.hcl b/distros/debian/11/amd64.pkrvars.hcl index 795b6cb..e93396e 100644 --- a/distros/debian/11/amd64.pkrvars.hcl +++ b/distros/debian/11/amd64.pkrvars.hcl @@ -16,6 +16,7 @@ boot_command = [ "debconf/frontend=noninteractive ", "hostname={{.Name}} ", "domain=vagrant ", + "console=ttyS0 ", "" ] http_directory = "distros/debian/11/http/" diff --git a/distros/debian/12/amd64.pkrvars.hcl b/distros/debian/12/amd64.pkrvars.hcl index d65e049..3278968 100644 --- a/distros/debian/12/amd64.pkrvars.hcl +++ b/distros/debian/12/amd64.pkrvars.hcl @@ -16,6 +16,7 @@ boot_command = [ "debconf/frontend=noninteractive ", "hostname={{.Name}} ", "domain=vagrant ", + "console=ttyS0 ", "" ] http_directory = "distros/debian/12/http/" diff --git a/distros/fedora/39/amd64.pkrvars.hcl b/distros/fedora/39/amd64.pkrvars.hcl index 2a25ab1..6c3821c 100644 --- a/distros/fedora/39/amd64.pkrvars.hcl +++ b/distros/fedora/39/amd64.pkrvars.hcl @@ -6,7 +6,7 @@ iso = { } boot_command = [ "e ", - "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg console=tty0" + "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg inst.notmux console=ttyS0" ] cd_files = [ "distros/fedora/39/*.cfg" diff --git a/distros/fedora/40/amd64.pkrvars.hcl b/distros/fedora/40/amd64.pkrvars.hcl index cde6fce..76fd884 100644 --- a/distros/fedora/40/amd64.pkrvars.hcl +++ b/distros/fedora/40/amd64.pkrvars.hcl @@ -6,7 +6,7 @@ iso = { } boot_command = [ "e ", - "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg console=tty0" + "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg inst.notmux console=ttyS0" ] cd_files = [ "distros/fedora/40/*.cfg" diff --git a/distros/fedora/rawhide/amd64.pkrvars.hcl.sh b/distros/fedora/rawhide/amd64.pkrvars.hcl.sh index fccdaab..fa06d83 100755 --- a/distros/fedora/rawhide/amd64.pkrvars.hcl.sh +++ b/distros/fedora/rawhide/amd64.pkrvars.hcl.sh @@ -35,7 +35,7 @@ iso = { } boot_command = [ "e", - "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg console=tty0 console=ttyS0" + "net.ifnames=0 biosdevnames=0 inst.ks=cdrom:/amd64-ks.cfg inst.notmux console=ttyS0" ] cd_files = [ "distros/fedora/rawhide/*.cfg" diff --git a/distros/opensuse/15.5/amd64.pkrvars.hcl b/distros/opensuse/15.5/amd64.pkrvars.hcl index 8b80ad3..ce2b718 100644 --- a/distros/opensuse/15.5/amd64.pkrvars.hcl +++ b/distros/opensuse/15.5/amd64.pkrvars.hcl @@ -9,6 +9,7 @@ boot_command = [ "", "", " autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml textmode=1", + " console=ttyS0", "x" ] http_directory = "distros/opensuse/15.5/http/" diff --git a/distros/opensuse/15.6/amd64.pkrvars.hcl b/distros/opensuse/15.6/amd64.pkrvars.hcl index 64a74be..8e158a1 100644 --- a/distros/opensuse/15.6/amd64.pkrvars.hcl +++ b/distros/opensuse/15.6/amd64.pkrvars.hcl @@ -9,6 +9,7 @@ boot_command = [ "", "", " autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml textmode=1", + " console=ttyS0", "x" ] http_directory = "distros/opensuse/15.6/http/" diff --git a/distros/opensuse/tumbleweed/amd64.pkrvars.hcl.sh b/distros/opensuse/tumbleweed/amd64.pkrvars.hcl.sh index 191c91b..9a6fe9c 100755 --- a/distros/opensuse/tumbleweed/amd64.pkrvars.hcl.sh +++ b/distros/opensuse/tumbleweed/amd64.pkrvars.hcl.sh @@ -26,6 +26,7 @@ boot_command = [ "e", "", " autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/autoinst.xml textmode=1", + " console=ttyS0", "x" ] http_directory = "distros/opensuse/tumbleweed/http/" diff --git a/distros/rockylinux/9/amd64.pkrvars.hcl b/distros/rockylinux/9/amd64.pkrvars.hcl index be8f547..12da5e9 100644 --- a/distros/rockylinux/9/amd64.pkrvars.hcl +++ b/distros/rockylinux/9/amd64.pkrvars.hcl @@ -8,6 +8,7 @@ boot_command = [ "e", "", " inst.text inst.ks=cdrom:/ks.cfg", + " inst.notmux console=ttyS0", "x" ] cd_files = [ "distros/rockylinux/9/disc/*" ] diff --git a/distros/ubuntu/20.04/amd64.pkrvars.hcl b/distros/ubuntu/20.04/amd64.pkrvars.hcl index 5c49cad..a95048e 100644 --- a/distros/ubuntu/20.04/amd64.pkrvars.hcl +++ b/distros/ubuntu/20.04/amd64.pkrvars.hcl @@ -7,7 +7,7 @@ iso = { boot_wait = "3s" boot_command = [ "e", - "console=tty0 ", + "console=ttyS0 ", "fsck.mode=skip ", "locale=en_US ", "auto=true ", diff --git a/distros/ubuntu/22.04/amd64.pkrvars.hcl b/distros/ubuntu/22.04/amd64.pkrvars.hcl index 96f325b..51baf9b 100644 --- a/distros/ubuntu/22.04/amd64.pkrvars.hcl +++ b/distros/ubuntu/22.04/amd64.pkrvars.hcl @@ -6,7 +6,7 @@ iso = { } boot_command = [ "e", - "console=tty0 ", + "console=ttyS0 ", "fsck.mode=skip ", "locale=en_US ", "auto=true ", diff --git a/distros/ubuntu/23.10/amd64.pkrvars.hcl b/distros/ubuntu/23.10/amd64.pkrvars.hcl index 3c8832a..59d3759 100644 --- a/distros/ubuntu/23.10/amd64.pkrvars.hcl +++ b/distros/ubuntu/23.10/amd64.pkrvars.hcl @@ -6,7 +6,7 @@ iso = { } boot_command = [ "e", - "console=tty0 ", + "console=ttyS0 ", "fsck.mode=skip ", "locale=en_US ", "auto=true ", diff --git a/sources/qemu.pkr.hcl b/sources/qemu.pkr.hcl index ffcfaa9..d1b82ee 100644 --- a/sources/qemu.pkr.hcl +++ b/sources/qemu.pkr.hcl @@ -31,10 +31,11 @@ source "qemu" "amd64" { efi_firmware_vars = "${var.efi_dir}OVMF_VARS.fd" qemuargs = [ - ["-chardev", "stdio,id=char0,logfile=serial-output-qemu-${var.arch}-${var.distro}-${var.version},signal=off"], + #["-chardev", "stdio,id=char0,logfile=serial-output-qemu-${var.arch}-${var.distro}-${var.version},signal=off"], ["-chardev", "socket,path=${local.name}.qga.sock,server=on,wait=off,id=qga0"], ["-device", "virtio-serial"], ["-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0"], + ["-serial", "stdio"] ] accelerator = var.qemu_accelerator