bugfixingr2.0

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@919 ef72aa8b-4018-0410-8976-d6e080ef94d8

7 files changed, 9 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index e8cad3c9..5a4600a9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,11 +26,14 @@ build:
 install:
 	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/usr/share/man/man1
+	mkdir -p $(DESTDIR)/usr/share/man/man5
 	mkdir -p $(DESTDIR)/usr/share/$(NAME)/extras
 	@gzip -c man/en/sosreport.1 > sosreport.1.gz
+	@gzip -c man/en/sos.conf.5 > sos.conf.5.gz
 	mkdir -p $(DESTDIR)/etc
 	install -m755 sosreport $(DESTDIR)/usr/sbin/sosreport
 	install -m644 sosreport.1.gz $(DESTDIR)/usr/share/man/man1/.
+	install -m644 sos.conf.5.gz $(DESTDIR)/usr/share/man/man5/.
 	install -m644 LICENSE README TODO $(DESTDIR)/usr/share/$(NAME)/.
 	install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf
 	install -m644 gpgkeys/rhsupport.pub $(DESTDIR)/usr/share/$(NAME)/.
diff --git a/sos.spec b/sos.spec
index cf8593b9..c43ccfbf 100644
--- a/sos.spec
+++ b/sos.spec
@@ -45,6 +45,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}
 %{python_sitelib}/*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %doc README TODO LICENSE ChangeLog doc/*
 %config(noreplace) %{_sysconfdir}/sos.conf
 
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index 2536bfc7..f3db92a1 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -54,7 +54,7 @@ class autofs(sos.plugintools.PluginBase):
         self.collectExtOutput("ps auxwww | grep automount")
         self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
         self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'")
-        self.collectExtOutput("/sbin/chkconfig --list autofs")
+        self.collectExtOutput("LC_ALL=C /sbin/chkconfig --list autofs")
         if self.checkdebug():
             self.addCopySpec(self.getdaemondebug())
         return
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 7b99e063..2d70f774 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -36,7 +36,7 @@ class hardware(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/s390dbf/tape")
         self.addCopySpec("/sys/bus/scsi")
         self.addCopySpec("/sys/state")
-        self.collectExtOutput("/usr/share/rhn/up2date_client/hardware.py")
+        self.collectExtOutput("/usr/share/rhn/up2dateclient/hardware.py")
         self.collectExtOutput("""/bin/echo -e "lspci:\n" ; /sbin/lspci ; /bin/echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; /bin/echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci")
 
         self.collectExtOutput("/usr/sbin/dmidecode", root_symlink = "dmidecode")
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index 320bcd82..c0cb139a 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -22,7 +22,7 @@ class startup(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/rc.d")
         
-        self.collectExtOutput("/sbin/chkconfig --list", root_symlink = "chkconfig")
+        self.collectExtOutput("LC_ALL=C /sbin/chkconfig --list", root_symlink = "chkconfig")
         if self.getOption('servicestatus'):
             self.collectExtOutput("/sbin/service --status-all")
         self.collectExtOutput("/sbin/runlevel")
diff --git a/sos/policyredhat.py b/sos/policyredhat.py
index caea9f34..c1165f6a 100755
--- a/sos/policyredhat.py
+++ b/sos/policyredhat.py
@@ -123,7 +123,7 @@ class SosPolicy:
 
     def runlevelByService(self, name):
         ret = []
-        p = Popen("/sbin/chkconfig --list %s" % name, shell=True, stdout=PIPE, stderr=PIPE, bufsize=-1)
+        p = Popen("LC_ALL=C /sbin/chkconfig --list %s" % name, shell=True, stdout=PIPE, stderr=PIPE, bufsize=-1)
         out, err = p.communicate() 
         if err:
             return ret
diff --git a/sos/sosreport.py b/sos/sosreport.py
index bce9bb9f..a11c5160 100755
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -47,7 +47,7 @@ from collections import deque
 
 from sos import _sos as _
 
-__version__ = 1.9
+__version__ = 2.0
 if os.path.isfile('/etc/fedora-release'):
     __distro__ = 'Fedora'
 else: