Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small bug fixes

This commit is contained in:
Severin Müller 2025-10-17 21:03:37 +02:00
parent 39e67f39f0
commit 668ca5978d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jsonrpc.go
View File

@ -775,8 +775,6 @@ func rpcSetActiveExtension(extensionId string) error {
_ = unmountATXControl() _ = unmountATXControl()
case "dc-power": case "dc-power":
_ = unmountDCControl() _ = unmountDCControl()
case "serial-buttons":
_ = unmountSerialButtons()
} }
config.ActiveExtension = extensionId config.ActiveExtension = extensionId
if err := SaveConfig(); err != nil { if err := SaveConfig(); err != nil {
@ -787,8 +785,6 @@ func rpcSetActiveExtension(extensionId string) error {
_ = mountATXControl() _ = mountATXControl()
case "dc-power": case "dc-power":
_ = mountDCControl() _ = mountDCControl()
case "serial-buttons":
_ = mountSerialButtons()
} }
return nil return nil
} }

8
serial.go
View File

@ -347,7 +347,7 @@ func getSerialSettings() (SerialSettings, error) {
file, err := os.Open(serialSettingsPath) file, err := os.Open(serialSettingsPath)
if err != nil { if err != nil {
logger.Info().Msg("SerialButtons config file doesn't exist, using default") logger.Info().Msg("SerialSettings file doesn't exist, using default")
return serialConfig, err return serialConfig, err
} }
defer file.Close() defer file.Close()
@ -355,7 +355,7 @@ func getSerialSettings() (SerialSettings, error) {
// load and merge the default config with the user config // load and merge the default config with the user config
var loadedConfig SerialSettings var loadedConfig SerialSettings
if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil { if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil {
logger.Warn().Err(err).Msg("SerialButtons config file JSON parsing failed") logger.Warn().Err(err).Msg("SerialSettings file JSON parsing failed")
return serialConfig, nil return serialConfig, nil
} }
@ -442,14 +442,14 @@ func setSerialSettings(newSettings SerialSettings) error {
file, err := os.Create(serialSettingsPath) file, err := os.Create(serialSettingsPath)
if err != nil { if err != nil {
return fmt.Errorf("failed to create SerialButtons config file: %w", err) return fmt.Errorf("failed to create SerialSettings file: %w", err)
} }
defer file.Close() defer file.Close()
encoder := json.NewEncoder(file) encoder := json.NewEncoder(file)
encoder.SetIndent("", " ") encoder.SetIndent("", " ")
if err := encoder.Encode(newSettings); err != nil { if err := encoder.Encode(newSettings); err != nil {
return fmt.Errorf("failed to encode SerialButtons config: %w", err) return fmt.Errorf("failed to encode SerialSettings: %w", err)
} }
var stopBits serial.StopBits var stopBits serial.StopBits