'ls' calls all use /bin/ls, and -n for nss safety

!! NOT FOR RHEL6 CONSUMPTION

- ls is always /bin/ls, as with almost every command moving to absolute path
- '-n' avoids many getpwuid()s, which are sensible to nss failures
  for example nss_ldap could be very slow and run prior to nss_files

7 files changed, 8 insertions, 8 deletions

diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py
index 9576f27e..49f9bcf3 100644
--- a/sos/plugins/bootloader.py
+++ b/sos/plugins/bootloader.py
@@ -27,4 +27,4 @@ class bootloader(sos.plugintools.PluginBase):
             "/boot/grub/device.map",
             "/boot/yaboot.conf"])
         self.collectExtOutput("/sbin/lilo -q")
-        self.collectExtOutput("/bin/ls -laR /boot")
+        self.collectExtOutput("/bin/ls -lanR /boot")
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index 1d93df57..03cb54fe 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -54,8 +54,8 @@ class devicemapper(sos.plugintools.PluginBase):
 
         self.collectExtOutput("/usr/bin/systool -v -c -b scsi")
 
-        self.collectExtOutput("/bin/ls -laR /dev")
-        self.collectExtOutput("/bin/ls -laR /sys/block")
+        self.collectExtOutput("/bin/ls -lanR /dev")
+        self.collectExtOutput("/bin/ls -lanR /sys/block")
 
         if self.getOption('lvmdump'):
             self.do_lvmdump()
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 7c57ee8d..5143f7b2 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -20,4 +20,4 @@ class pam(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/pam.d")
         self.addCopySpec("/etc/security")
-        self.collectExtOutput("/bin/ls -laF /lib/security")
+        self.collectExtOutput("/bin/ls -lanF /lib/security")
diff --git a/sos/plugins/qpidd.py b/sos/plugins/qpidd.py
index 5f9dce69..5684806b 100644
--- a/sos/plugins/qpidd.py
+++ b/sos/plugins/qpidd.py
@@ -32,7 +32,7 @@ class qpidd(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/qpid-stat -c")
         self.collectExtOutput("/usr/bin/qpid-route link list")
         self.collectExtOutput("/usr/bin/qpid-route route list")
-        self.collectExtOutput("ls -lR /var/lib/qpidd")
+        self.collectExtOutput("/bin/ls -lanR /var/lib/qpidd")
         self.addCopySpecs([
             "/etc/qpidd.conf",
             "/var/lib/qpid/syslog",
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index de8519c6..a5445ee7 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -57,7 +57,7 @@ class s390(sos.plugintools.PluginBase):
         self.collectExtOutput("find /sys -type f")
         self.collectExtOutput("find /proc/s390dbf -type f")
         self.collectExtOutput("/sbin/qethconf list_all")
-        ret, dasdDev, rtime = self.callExtProg("ls /dev/dasd?")
+        ret, dasdDev, rtime = self.callExtProg("/bin/ls /dev/dasd?")
         for x in dasdDev.split('\n'):
             self.collectExtOutput("/sbin/dasdview -x -i -j -l -f %s" % (x,))
             self.collectExtOutput("/sbin/fdasd -p %s" % (x,))
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 856199b0..ce628501 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -32,4 +32,4 @@ class smartcard(sos.plugintools.PluginBase):
             "/etc/pam_pkcs11/"])
         self.collectExtOutput("/usr/bin/pkcs11_inspect debug")
         self.collectExtOutput("/usr/bin/pklogin_finder debug")
-        self.collectExtOutput("/bin/ls -l /usr/lib*/pam_pkcs11/")
+        self.collectExtOutput("/bin/ls -nl /usr/lib*/pam_pkcs11/")
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index a8507c00..500dc535 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -24,4 +24,4 @@ class tftpserver(sos.plugintools.PluginBase):
         return self.isInstalled("tftp-server") or exists("/etc/xinetd.d/tftp")
 
     def setup(self):
-        self.collectExtOutput("/bin/ls -laR /tftpboot")
+        self.collectExtOutput("/bin/ls -lanR /tftpboot")