Skip to content

Commit

Permalink
Make SUSEConnect -d error message on Public Cloud generic
Browse files Browse the repository at this point in the history
SUSEConnect -d is disabled on Public Cloud instances when registrecloudguest
is present. This is to ensure that the correct de-registration action happens
whether the system is connected to SCC or the update infrastructure.
Initially this only mattered for PAYG. However with BYOS instances being
able to connect to the update infrastructure we need the message to not refer
to PAYG anymore.
  • Loading branch information
rjschwei committed Oct 18, 2024
1 parent b7159ce commit 2a96e49
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build/packaging/suseconnect-ng.changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Fri Sep 13 15:56:05 UTC 2024 - Miquel Sabate Sola <msabate@suse.com>

- IN PROGRESS: 1.13
- Integrating uptime-tracker
- Update error message for Public Cloud instances with registercloudguest
installed. SUSEConnect -d is disabled on PYAG and BYOS when the
registercloudguest command is available. (bsc#1230861)

-------------------------------------------------------------------
Fri Sep 13 14:11:22 UTC 2024 - Miquel Sabate Sola <msabate@suse.com>
Expand Down
2 changes: 1 addition & 1 deletion internal/connect/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func registerProductTree(product Product, jsonOutput bool, out *RegisterOut) err
func Deregister(jsonOutput bool) error {
if util.FileExists("/usr/sbin/registercloudguest") && CFG.Product.isEmpty() {
return fmt.Errorf("SUSE::Connect::UnsupportedOperation: " +
"De-registration is disabled for on-demand instances. " +
"De-registration via SUSEConnect is disabled by registercloudguest." +
"Use `registercloudguest --clean` instead.")
}

Expand Down

0 comments on commit 2a96e49

Please sign in to comment.