diff options
| author | Bryan Quigley <bryan.quigley@canonical.com> | 2018-06-05 13:28:29 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-06-07 16:43:42 +0100 |
| commit | c3c4603a7b897b13769096d93220d130e73b52cd (patch) | |
| tree | bdaf84ca3d9ed0f2e646454d01cef64294150700 | |
| parent | 7b9d4baee31383cb85159ba7aa58a1c56e5df88a (diff) | |
| download | sos-c3c4603a7b897b13769096d93220d130e73b52cd.tar.gz | |
[Ubuntu] Add ubuntu-advantage status, u-s-s to better default and hwe
Add ubuntu-advantage status which is installed by default on Ubuntu and
shows when various UA items are enabled - esm, fips, and livepatch.
Switch ubuntu-support-status to always --show-all. It takes exactly
the same amount of time to run (in both cases it's relatively slow at
3 seconds), and only adds 30k uncompressed/12k compressed.
Add hwe-support-status to give more details about Ubuntu Hardware
enablement if present.
Resolves: #1330
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/ubuntu.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sos/plugins/ubuntu.py b/sos/plugins/ubuntu.py index 4ce7ee1a..e8ef5e61 100644 --- a/sos/plugins/ubuntu.py +++ b/sos/plugins/ubuntu.py @@ -16,16 +16,9 @@ class Ubuntu(Plugin, UbuntuPlugin): plugin_name = 'ubuntu' profiles = ('system',) - option_list = [ - ('support-show-all', - 'Show all packages with their status', '', False), - ] - def setup(self): - cmd = ["ubuntu-support-status"] - - if self.get_option('support-show-all'): - cmd.append("--show-all") - - self.add_cmd_output(" ".join(cmd), - suggest_filename='ubuntu-support-status.txt') + self.add_cmd_output([ + "ubuntu-support-status --show-all", + "hwe-support-status --verbose", + "ubuntu-advantage status" + ]) |