mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Allow console take over.

Browse source
This commit is contained in:
Michael Lipp 2025-02-27 22:55:50 +01:00
parent b409443499
commit 3152ff842b
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/DisplayController.java
View file

@ -35,7 +35,6 @@ import org.jdrupes.vmoperator.runner.qemu.events.MonitorCommand;
import org.jdrupes.vmoperator.runner.qemu.events.RunnerStateChange.RunState; import org.jdrupes.vmoperator.runner.qemu.events.RunnerStateChange.RunState;
import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentConnected; import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentConnected;
import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentLogIn; import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentLogIn;
import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentLogOut;
import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentLoggedIn; import org.jdrupes.vmoperator.runner.qemu.events.VmopAgentLoggedIn;
import org.jgrapes.core.Channel; import org.jgrapes.core.Channel;
import org.jgrapes.core.Component; import org.jgrapes.core.Component;
@ -53,7 +52,6 @@ public class DisplayController extends Component {
private String protocol; private String protocol;
private final Path configDir; private final Path configDir;
private boolean vmopAgentConnected; private boolean vmopAgentConnected;
private boolean userLoginRequested;
/** /**
* Instantiates a new Display controller. * Instantiates a new Display controller.
@ -112,13 +110,6 @@ public class DisplayController extends Component {
var userLoginConfigured = readFromFile(DATA_DISPLAY_LOGIN) var userLoginConfigured = readFromFile(DATA_DISPLAY_LOGIN)
.map(Boolean::parseBoolean).orElse(false); .map(Boolean::parseBoolean).orElse(false);
if (!userLoginConfigured) { if (!userLoginConfigured) {
// Check if it was configured before and there may thus be an
// active auto login
if (userLoginRequested && vmopAgentConnected) {
// Make sure to log out
fire(new VmopAgentLogOut());
}
userLoginRequested = false;
configurePassword(); configurePassword();
return; return;
} }
@ -126,7 +117,6 @@ public class DisplayController extends Component {
// With user login configured, we have to make sure that the // With user login configured, we have to make sure that the
// user is logged in before we set the password and thus allow // user is logged in before we set the password and thus allow
// access to the display. // access to the display.
userLoginRequested = true;
if (!vmopAgentConnected) { if (!vmopAgentConnected) {
if (passwordChange) { if (passwordChange) {
logger.warning(() -> "Request for user login before " logger.warning(() -> "Request for user login before "