Skip to content

Commit

Permalink
susedistribution: bootloader_setup: Add user-sut-serial
Browse files Browse the repository at this point in the history
Add user-sut-serial - ssh-virtsh-serial console for user.

ssh-virtsh-serial is svirt serial console for user. Adding a link helps
switching between root and non root user in select_serial_terminal().

This commit is similar to 4a89bfb ("susedistribution: Run user virtio
console on it's own socket").

This requires API version 39, merged in
os-autoinst/os-autoinst#2330

NOTE: guarders if (isotovideo::get_version() >= 39) aren't used,
because they trigger warnings "Use of uninitialized value in numeric
ge (>=)" on imports (outside of functions).

Implements: poo#131258
Signed-off-by: Petr Vorel <pvorel@suse.cz>
  • Loading branch information
pevik committed Jul 6, 2023
1 parent 98cbe62 commit c1e4fd3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
13 changes: 11 additions & 2 deletions lib/bootloader_setup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use version_utils qw(is_microos is_sle_micro is_jeos is_leap is_sle is_tumblewee
use mm_network;
use Utils::Backends;

use backend::svirt qw(SERIAL_TERMINAL_DEFAULT_DEVICE SERIAL_TERMINAL_DEFAULT_PORT SERIAL_CONSOLE_DEFAULT_DEVICE SERIAL_CONSOLE_DEFAULT_PORT);
use backend::svirt qw(SERIAL_TERMINAL_DEFAULT_DEVICE SERIAL_TERMINAL_DEFAULT_PORT SERIAL_CONSOLE_DEFAULT_DEVICE SERIAL_CONSOLE_DEFAULT_PORT SERIAL_USER_TERMINAL_DEFAULT_DEVICE SERIAL_USER_TERMINAL_DEFAULT_PORT);

our @EXPORT = qw(
add_custom_grub_entries
Expand Down Expand Up @@ -1134,14 +1134,23 @@ sub zkvm_add_pty {
target_port => SERIAL_CONSOLE_DEFAULT_PORT
});

# sut-serial (serial terminal: emulation of QEMU's virtio console for svirt)
# ssh-virtsh-serial for root (serial terminal: emulation of QEMU's virtio console for svirt)
$svirt->add_pty(
{
pty_dev => SERIAL_TERMINAL_DEFAULT_DEVICE,
pty_dev_type => 'pty',
target_type => 'virtio',
target_port => SERIAL_TERMINAL_DEFAULT_PORT
});

# ssh-virtsh-serial for user (serial terminal: emulation of QEMU's virtio console for svirt)
$svirt->add_pty(
{
pty_dev => SERIAL_USER_TERMINAL_DEFAULT_DEVICE,
pty_dev_type => 'pty',
target_type => 'virtio',
target_port => SERIAL_USER_TERMINAL_DEFAULT_PORT
});
}

sub zkvm_add_interface {
Expand Down
11 changes: 9 additions & 2 deletions lib/susedistribution.pm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ use utils qw(
use version_utils qw(is_hyperv_in_gui is_sle is_leap is_svirt_except_s390x is_tumbleweed is_opensuse);
use x11utils qw(desktop_runner_hotkey ensure_unlocked_desktop x11_start_program_xterm);
use Utils::Backends;
use backend::svirt qw(SERIAL_TERMINAL_DEFAULT_DEVICE SERIAL_TERMINAL_DEFAULT_PORT);

use backend::svirt qw(SERIAL_TERMINAL_DEFAULT_DEVICE SERIAL_TERMINAL_DEFAULT_PORT SERIAL_USER_TERMINAL_DEFAULT_DEVICE SERIAL_USER_TERMINAL_DEFAULT_PORT);

use Cwd;
use autotest 'query_isotovideo';
use isotovideo;
Expand Down Expand Up @@ -476,10 +478,15 @@ sub init_consoles {
});
set_var('SVIRT_VNC_CONSOLE', 'sut');
} else {
# sut-serial (serial terminal: emulation of QEMU's virtio console for svirt)
# ssh-virtsh-serial for root (serial terminal: emulation of QEMU's virtio console for svirt)
$self->add_console('root-sut-serial', 'ssh-virtsh-serial', {
pty_dev => SERIAL_TERMINAL_DEFAULT_DEVICE,
target_port => SERIAL_TERMINAL_DEFAULT_PORT});

# ssh-virtsh-serial for user (serial terminal: emulation of QEMU's virtio console for svirt)
$self->add_console('user-sut-serial', 'ssh-virtsh-serial', {
pty_dev => SERIAL_USER_TERMINAL_DEFAULT_DEVICE,
target_port => SERIAL_USER_TERMINAL_DEFAULT_PORT});
}

if ((get_var('BACKEND', '') =~ /qemu|ikvm/
Expand Down

0 comments on commit c1e4fd3

Please sign in to comment.