From eb30c1d1346dc809639f054e12023ac9c6d73f44 Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:44:25 -0300
Subject: [PATCH] fix(xcat-server): install tmux on KVM hosts for the serial
 console

cons/kvm drives the KVM guest serial console through a shared tmux session on
the hypervisor (tmux, unlike screen, is present on every libvirt host we target
incl. ppc64le hosts that ship no screen). The KVM host package lists were never
updated for that switch, so an xCAT-provisioned KVM host got 'screen' (now
unused) -- or nothing -- where tmux is required, leaving rcons broken.

Ship tmux in the KVM host pkglists:
  - install/rh, install/ubuntu: screen -> tmux / add tmux.
  - netboot/{alma,centos,rocky}: were symlinks to the RHEL 5.4 list; make them
    real lists with tmux (the rhel5/6/7 lists keep screen).
  - install/suse: add a KVM host list (SUSE had none) carrying tmux.

screen stays where it is still used: the Xen console, and the EOL rhel5/6/7 and
centos6/7 lists.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
(cherry picked from commit c1db278e1a1835f742439ce4b55ead46469d3e66)
---
 xCAT-server/share/xcat/install/rh/kvm.pkglist |  2 +-
 .../share/xcat/install/suse/kvm.pkglist       |  8 +++++
 .../share/xcat/install/ubuntu/kvm.pkglist     |  1 +
 .../share/xcat/netboot/alma/kvm.pkglist       | 29 ++++++++++++++++++-
 .../share/xcat/netboot/centos/kvm.pkglist     | 29 ++++++++++++++++++-
 .../share/xcat/netboot/rocky/kvm.pkglist      | 29 ++++++++++++++++++-
 6 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 xCAT-server/share/xcat/install/suse/kvm.pkglist
 mode change 120000 => 100644 xCAT-server/share/xcat/netboot/alma/kvm.pkglist
 mode change 120000 => 100644 xCAT-server/share/xcat/netboot/centos/kvm.pkglist
 mode change 120000 => 100644 xCAT-server/share/xcat/netboot/rocky/kvm.pkglist

diff --git a/xCAT-server/share/xcat/install/rh/kvm.pkglist b/xCAT-server/share/xcat/install/rh/kvm.pkglist
index b3a6b535c..817028a88 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.pkglist
+++ b/xCAT-server/share/xcat/install/rh/kvm.pkglist
@@ -4,6 +4,6 @@ nfs-utils
 sendmail-cf
 openssh-server
 util-linux
-screen
+tmux
 bridge-utils
 dnsmasq
diff --git a/xCAT-server/share/xcat/install/suse/kvm.pkglist b/xCAT-server/share/xcat/install/suse/kvm.pkglist
new file mode 100644
index 000000000..bdf848272
--- /dev/null
+++ b/xCAT-server/share/xcat/install/suse/kvm.pkglist
@@ -0,0 +1,8 @@
+#Please make sure there is a space between @ and group name
+ntp
+nfs-client
+openssh
+util-linux
+tmux
+bridge-utils
+dnsmasq
diff --git a/xCAT-server/share/xcat/install/ubuntu/kvm.pkglist b/xCAT-server/share/xcat/install/ubuntu/kvm.pkglist
index edad393e0..1b4a77b1e 100644
--- a/xCAT-server/share/xcat/install/ubuntu/kvm.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/kvm.pkglist
@@ -8,3 +8,4 @@ libvirt-bin
 bridge-utils
 libcap2-bin
 vlan
+tmux
diff --git a/xCAT-server/share/xcat/netboot/alma/kvm.pkglist b/xCAT-server/share/xcat/netboot/alma/kvm.pkglist
deleted file mode 120000
index 010315c63..000000000
--- a/xCAT-server/share/xcat/netboot/alma/kvm.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-../rh/kvm.rhels5.4.pkglist
\ No newline at end of file
diff --git a/xCAT-server/share/xcat/netboot/alma/kvm.pkglist b/xCAT-server/share/xcat/netboot/alma/kvm.pkglist
new file mode 100644
index 000000000..2e60f71ef
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/alma/kvm.pkglist
@@ -0,0 +1,28 @@
+bash
+postfix
+nfs-utils
+openssl
+dhclient
+kernel
+openssh-server
+openssh-clients
+busybox-anaconda
+wget
+vim-minimal
+ntp
+sysklogd
+rpm
+rsync
+bridge-utils
+dnsmasq
+iscsi-initiator-utils
+kvm
+libvirt.x86_64
+perl-Sys-Virt
+python-urlgrabber.noarch
+python-virtinst
+tmux
+xnba-kvm
+tar
+gzip
+xz
diff --git a/xCAT-server/share/xcat/netboot/centos/kvm.pkglist b/xCAT-server/share/xcat/netboot/centos/kvm.pkglist
deleted file mode 120000
index 010315c63..000000000
--- a/xCAT-server/share/xcat/netboot/centos/kvm.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-../rh/kvm.rhels5.4.pkglist
\ No newline at end of file
diff --git a/xCAT-server/share/xcat/netboot/centos/kvm.pkglist b/xCAT-server/share/xcat/netboot/centos/kvm.pkglist
new file mode 100644
index 000000000..2e60f71ef
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/centos/kvm.pkglist
@@ -0,0 +1,28 @@
+bash
+postfix
+nfs-utils
+openssl
+dhclient
+kernel
+openssh-server
+openssh-clients
+busybox-anaconda
+wget
+vim-minimal
+ntp
+sysklogd
+rpm
+rsync
+bridge-utils
+dnsmasq
+iscsi-initiator-utils
+kvm
+libvirt.x86_64
+perl-Sys-Virt
+python-urlgrabber.noarch
+python-virtinst
+tmux
+xnba-kvm
+tar
+gzip
+xz
diff --git a/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist b/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist
deleted file mode 120000
index 010315c63..000000000
--- a/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-../rh/kvm.rhels5.4.pkglist
\ No newline at end of file
diff --git a/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist b/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist
new file mode 100644
index 000000000..2e60f71ef
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rocky/kvm.pkglist
@@ -0,0 +1,28 @@
+bash
+postfix
+nfs-utils
+openssl
+dhclient
+kernel
+openssh-server
+openssh-clients
+busybox-anaconda
+wget
+vim-minimal
+ntp
+sysklogd
+rpm
+rsync
+bridge-utils
+dnsmasq
+iscsi-initiator-utils
+kvm
+libvirt.x86_64
+perl-Sys-Virt
+python-urlgrabber.noarch
+python-virtinst
+tmux
+xnba-kvm
+tar
+gzip
+xz