diff options
| author | Adam Stokes <adam.stokes@ubuntu.com> | 2013-07-31 09:58:20 -0400 |
|---|---|---|
| committer | Adam Stokes <adam.stokes@ubuntu.com> | 2013-07-31 09:58:20 -0400 |
| commit | 30ed1beb6a4217072117a3735844e3ec4f1bac92 (patch) | |
| tree | c70b5299307cdfedac9b7ea69d6613d6d5c22fa3 | |
| parent | 3555240c87bc1d31501a750af836eaa89eb58539 (diff) | |
| parent | 1b3fc3f029ed3ab1dcbfeaaaa8fe1616dbc3744f (diff) | |
| download | sos-30ed1beb6a4217072117a3735844e3ec4f1bac92.tar.gz | |
Merge branch 'master' into patch-debian-updates
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | sos/plugins/rpm.py | 8 | ||||
| -rw-r--r-- | sos/plugins/samba.py | 4 |
3 files changed, 18 insertions, 5 deletions
@@ -30,10 +30,15 @@ Fedora/RHEL users install via yum: yum install sos ``` -Debian/Ubuntu users can install via PPA: +Debian(Sid) users install via apt: + +``` +apt-get install sosreport +``` + + +Ubuntu(Saucy 13.10) users install via apt: ``` -sudo add-apt-repository ppa:debugmonkeys/sosreport -sudo apt-get update sudo apt-get install sosreport ``` diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py index 9d44fde2..a3150188 100644 --- a/sos/plugins/rpm.py +++ b/sos/plugins/rpm.py @@ -23,6 +23,8 @@ class Rpm(Plugin, RedHatPlugin): option_list = [("rpmq", "queries for package information via rpm -q", "fast", True), ("rpmva", "runs a verify on all packages", "slow", False)] + verify_list = [ 'kernel', 'glibc', 'pam_.*' ] + def setup(self): self.add_copy_spec("/var/log/rpmpkgs") @@ -36,3 +38,9 @@ class Rpm(Plugin, RedHatPlugin): if self.get_option("rpmva"): self.add_cmd_output("rpm -Va", root_symlink = "rpm-Va", timeout = 3600) + else: + pkgs_by_regex = self.policy().package_manager.all_pkgs_by_name_regex + verify_list = map(pkgs_by_regex, self.verify_list) + for pkg_list in verify_list: + for pkg in pkg_list: + self.add_cmd_output("rpm -V %s" % pkg) diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py index d4e2fe82..f3a44b77 100644 --- a/sos/plugins/samba.py +++ b/sos/plugins/samba.py @@ -23,8 +23,8 @@ class Samba(Plugin): self.add_copy_specs([ "/etc/samba", "/var/log/samba/*",]) - self.add_cmd_output("wbinfo -g") - self.add_cmd_output("wbinfo -u") + self.add_cmd_output("wbinfo --domain='.' -g") + self.add_cmd_output("wbinfo --domain='.' -u") self.add_cmd_output("testparm -s -v") |