Remove absolute paths from plug-ins

Now that policies have control of PATH there is no need for
plug-ins to try to guess the correct absolute path (or work
around cases where it is known to have changed).

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

58 files changed, 306 insertions, 306 deletions

diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index ce5c7c10..3e5bdeb0 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -28,16 +28,16 @@ class abrt(Plugin, RedHatPlugin):
                exists("/var/spool/abrt")
 
     def do_backtraces(self):
-        ret, output, rtime = self.call_ext_prog('/usr/bin/sqlite3 /var/spool/abrt/abrt-db \'select UUID from abrt_v4\'')
+        ret, output, rtime = self.call_ext_prog('sqlite3 /var/spool/abrt/abrt-db \'select UUID from abrt_v4\'')
         try:
             for uuid in output.split():
-                self.add_cmd_output("/usr/bin/abrt-cli -ib %s" % uuid,
+                self.add_cmd_output("abrt-cli -ib %s" % uuid,
                     suggest_filename=("backtrace_%s" % uuid))
         except IndexError:
             pass
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/abrt-cli -lf",
+        self.add_cmd_output("abrt-cli -lf",
                 suggest_filename="abrt-log")
         if self.get_option('backtraces'):
             self.do_backtraces()
diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py
index d13f0db0..11c8735d 100644
--- a/sos/plugins/amd.py
+++ b/sos/plugins/amd.py
@@ -24,5 +24,5 @@ class amd(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_copy_specs("/etc/amd.*")
-        self.add_cmd_output("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
-        self.add_cmd_output("/bin/mount | egrep -e 'automount|pid.*nfs'")
+        self.add_cmd_output("egrep -e 'automount|pid.*nfs' /proc/mounts")
+        self.add_cmd_output("mount | egrep -e 'automount|pid.*nfs'")
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index abf90b0f..ce529bb9 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -48,8 +48,8 @@ class autofs(Plugin):
         self.add_copy_spec("/etc/auto*")
         self.add_cmd_output("/etc/init.d/autofs status")
         self.add_cmd_output("ps auxwww | grep automount")
-        self.add_cmd_output("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
-        self.add_cmd_output("/bin/mount | egrep -e 'automount|pid.*nfs'")
+        self.add_cmd_output("egrep -e 'automount|pid.*nfs' /proc/mounts")
+        self.add_cmd_output("mount | egrep -e 'automount|pid.*nfs'")
         if self.checkdebug():
             self.add_copy_spec(self.getdaemondebug())
 
@@ -58,11 +58,11 @@ class RedHatAutofs(autofs, RedHatPlugin):
 
     def setup(self):
         super(RedHatAutofs, self).setup()
-        self.add_cmd_output("/bin/rpm -qV autofs")
+        self.add_cmd_output("rpm -qV autofs")
 
 class DebianAutofs(autofs, DebianPlugin, UbuntuPlugin):
     """autofs server-related on Debian based distributions"""
 
     def setup(self):
         super(DebianAutofs, self).setup()
-        self.add_cmd_output("/usr/bin/dpkg-query -s autofs")
+        self.add_cmd_output("dpkg-query -s autofs")
diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py
index 80a2f705..ead4c8ae 100644
--- a/sos/plugins/bootloader.py
+++ b/sos/plugins/bootloader.py
@@ -27,5 +27,5 @@ class bootloader(Plugin, RedHatPlugin, UbuntuPlugin):
             "/boot/grub/device.map",
             "/etc/grub.d",
             "/boot/yaboot.conf"])
-        self.add_cmd_output("/sbin/lilo -q")
-        self.add_cmd_output("/bin/ls -lanR /boot")
+        self.add_cmd_output("lilo -q")
+        self.add_cmd_output("ls -lanR /boot")
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
index 7ee3bc07..52668c26 100644
--- a/sos/plugins/ceph.py
+++ b/sos/plugins/ceph.py
@@ -29,11 +29,11 @@ class ceph(Plugin, RedHatPlugin, UbuntuPlugin):
         self.add_copy_specs(["/etc/ceph/",
                            "/var/log/ceph/"])
 
-        self.add_cmd_output("/usr/bin/ceph status")
-        self.add_cmd_output("/usr/bin/ceph health")
-        self.add_cmd_output("/usr/bin/ceph osd tree")
-        self.add_cmd_output("/usr/bin/ceph osd stat")
-        self.add_cmd_output("/usr/bin/ceph osd dump")
-        self.add_cmd_output("/usr/bin/ceph mon stat")
-        self.add_cmd_output("/usr/bin/ceph mon dump")
+        self.add_cmd_output("ceph status")
+        self.add_cmd_output("ceph health")
+        self.add_cmd_output("ceph osd tree")
+        self.add_cmd_output("ceph osd stat")
+        self.add_cmd_output("ceph osd dump")
+        self.add_cmd_output("ceph mon stat")
+        self.add_cmd_output("ceph mon dump")
 
diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py
index aa2b2090..7027c96d 100644
--- a/sos/plugins/cloudforms.py
+++ b/sos/plugins/cloudforms.py
@@ -23,11 +23,11 @@ class cloudforms(Plugin, RedHatPlugin):
     packages = ["katello", "katello-common",
                     "katello-headpin", "aeoleus-conductor"]
     files = ["/usr/share/katello/script/katello-debug",
-                "/usr/bin/aeolus-debug"]
+                "aeolus-debug"]
 
     def setup(self):
         katello_debug = "/usr/share/katello/script/katello-debug"
-        aeolus_debug = "/usr/bin/aeolus-debug"
+        aeolus_debug = "aeolus-debug"
         if os.path.isfile(katello_debug):
             katello_debug_path = os.path.join(self.commons['dstroot'],"katello-debug")
             self.add_cmd_output("%s --notar -d %s" % (katello_debug, katello_debug_path))
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 2383b370..7b169bd3 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -65,20 +65,20 @@ class cluster(Plugin, RedHatPlugin):
         if self.get_option('lockdump'):
           self.do_lockdump()
 
-        self.add_cmd_output("/usr/sbin/rg_test test "
+        self.add_cmd_output("rg_test test "
                         + "/etc/cluster/cluster.conf" )
         self.add_cmd_output("fence_tool ls -n")
         self.add_cmd_output("gfs_control ls -n")
         self.add_cmd_output("dlm_tool log_plock")
 
-        self.add_cmd_output("/sbin/fdisk -l")
+        self.add_cmd_output("fdisk -l")
         self.get_cmd_output_now("clustat")
         self.get_cmd_output_now("group_tool dump")
         self.add_cmd_output("cman_tool services")
         self.add_cmd_output("cman_tool nodes")
         self.add_cmd_output("cman_tool status")
         self.add_cmd_output("ccs_tool lsnode")
-        self.add_cmd_output("/sbin/ipvsadm -L")
+        self.add_cmd_output("ipvsadm -L")
 
         if rhelver is 4:
             self.add_copy_spec("/proc/cluster/*")
@@ -135,7 +135,7 @@ class cluster(Plugin, RedHatPlugin):
     def do_gfslockdump(self):
         for mntpoint in self.do_regex_find_all(r'^\S+\s+([^\s]+)\s+gfs\s+.*$',
                     "/proc/mounts"):
-            self.add_cmd_output("/sbin/gfs_tool lockdump %s" % mntpoint,
+            self.add_cmd_output("gfs_tool lockdump %s" % mntpoint,
                         suggest_filename = "gfs_lockdump_"
                         + self.mangle_command(mntpoint))
 
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py
index b02d99a6..2c2bf35b 100644
--- a/sos/plugins/corosync.py
+++ b/sos/plugins/corosync.py
@@ -18,7 +18,7 @@ class corosync(Plugin, RedHatPlugin):
     """ corosync information
     """
 
-    files = ('/usr/bin/corosync',)
+    files = ('corosync',)
     packages = ('corosync',)
 
     def setup(self):
@@ -31,6 +31,6 @@ class corosync(Plugin, RedHatPlugin):
         self.add_cmd_output("corosync-cpgtool")
         self.add_cmd_output("corosync-objctl -a")
         self.add_cmd_output("corosync-fplay")
-        self.add_cmd_output("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_state=$(date +\%s)")
-        self.add_cmd_output("/usr/sbin/corosync-objctl -w runtime.blackbox.dump_flight_data=$(date +\%s)")
+        self.add_cmd_output("corosync-objctl -w runtime.blackbox.dump_state=$(date +\%s)")
+        self.add_cmd_output("corosync-objctl -w runtime.blackbox.dump_flight_data=$(date +\%s)")
         self.call_ext_prog("killall -USR2 corosync")
diff --git a/sos/plugins/crontab.py b/sos/plugins/crontab.py
index e5323ba2..bcbb315d 100644
--- a/sos/plugins/crontab.py
+++ b/sos/plugins/crontab.py
@@ -22,7 +22,7 @@ class crontab(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         self.add_copy_spec("/etc/cron*")
-        self.add_cmd_output("/usr/bin/crontab -l -u root", suggest_filename = "root_crontab")
+        self.add_cmd_output("crontab -l -u root", suggest_filename = "root_crontab")
         self.add_cmd_output("""for i in `ls /home/`;\
-        do echo "User :" $i;/usr/bin/crontab -l -u $i;\
+        do echo "User :" $i;crontab -l -u $i;\
         echo "---------------";done""", suggest_filename = "users_crontabs")
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index aac90193..1aded5b0 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -32,30 +32,30 @@ class devicemapper(Plugin, RedHatPlugin):
         self.add_cmd_output(cmd)
 
     def setup(self):
-        self.add_cmd_output("/sbin/dmsetup info -c")
-        self.add_cmd_output("/sbin/dmsetup table")
-        self.add_cmd_output("/sbin/dmsetup status")
-        self.add_cmd_output("/sbin/dmsetup ls --tree")
+        self.add_cmd_output("dmsetup info -c")
+        self.add_cmd_output("dmsetup table")
+        self.add_cmd_output("dmsetup status")
+        self.add_cmd_output("dmsetup ls --tree")
 
-        self.add_cmd_output("/sbin/vgdisplay -vv", root_symlink = "vgdisplay")
-        self.add_cmd_output("/sbin/vgscan -vvv")
-        self.add_cmd_output("/sbin/pvscan -v")
-        self.add_cmd_output("/sbin/lvs -a -o +devices")
-        self.add_cmd_output("/sbin/pvs -a -v")
-        self.add_cmd_output("/sbin/vgs -v")
-        self.add_cmd_output("/sbin/mdadm -D /dev/md*")
+        self.add_cmd_output("vgdisplay -vv", root_symlink = "vgdisplay")
+        self.add_cmd_output("vgscan -vvv")
+        self.add_cmd_output("pvscan -v")
+        self.add_cmd_output("lvs -a -o +devices")
+        self.add_cmd_output("pvs -a -v")
+        self.add_cmd_output("vgs -v")
+        self.add_cmd_output("mdadm -D /dev/md*")
 
         self.add_copy_specs([
             "/etc/lvm",
             "/etc/multipath/",
             "/etc/multipath.conf",
             "/var/lib/multipath/bindings"])
-        self.add_cmd_output("/sbin/multipath -v4 -ll")
+        self.add_cmd_output("multipath -v4 -ll")
 
-        self.add_cmd_output("/usr/bin/systool -v -c -b scsi")
+        self.add_cmd_output("systool -v -c -b scsi")
 
-        self.add_cmd_output("/bin/ls -lanR /dev")
-        self.add_cmd_output("/bin/ls -lanR /sys/block")
+        self.add_cmd_output("ls -lanR /dev")
+        self.add_cmd_output("ls -lanR /sys/block")
 
         if self.get_option('lvmdump'):
             self.do_lvmdump()
@@ -64,6 +64,6 @@ class devicemapper(Plugin, RedHatPlugin):
            for disk in os.listdir("/sys/block"):
               if disk in [ ".",  ".." ] or disk.startswith("ram"):
                  continue
-              self.add_cmd_output("/usr/bin/udevinfo -ap /sys/block/%s" % (disk))
+              self.add_cmd_output("udevinfo -ap /sys/block/%s" % (disk))
         for opt in self.dmraid_options:
-            self.add_cmd_output("/sbin/dmraid -%s" % (opt,))
+            self.add_cmd_output("dmraid -%s" % (opt,))
diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py
index 534f2e4c..b3c5f929 100644
--- a/sos/plugins/dovecot.py
+++ b/sos/plugins/dovecot.py
@@ -21,4 +21,4 @@ class dovecot(Plugin, RedHatPlugin):
     def setup(self):
         if os.path.exists("/etc/dovecot.conf"):
             self.add_copy_spec("/etc/dovecot*")
-            self.add_cmd_output("/usr/sbin/dovecot -n")
+            self.add_cmd_output("dovecot -n")
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index b95db952..a3b55a60 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -20,4 +20,4 @@ class dpkg(Plugin, DebianPlugin, UbuntuPlugin):
     """
     def setup(self):
         self.add_copy_spec("/var/log/dpkg.log")
-        self.add_cmd_output("/usr/bin/dpkg -l", root_symlink = "installed-debs")
+        self.add_cmd_output("dpkg -l", root_symlink = "installed-debs")
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index c386e70e..88b3ba21 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -36,7 +36,7 @@ class emc(Plugin, RedHatPlugin):
     def get_pp_files(self):
         """ EMC PowerPath specific information - files
         """
-        self.add_cmd_output("/sbin/powermt version")
+        self.add_cmd_output("powermt version")
         self.add_copy_specs([
             "/etc/init.d/PowerPath",
             "/etc/powermt.custom",
@@ -51,13 +51,13 @@ class emc(Plugin, RedHatPlugin):
     def get_pp_config(self):
         """ EMC PowerPath specific information - commands
         """
-        self.add_cmd_output("/sbin/powermt display")
-        self.add_cmd_output("/sbin/powermt display dev=all")
-        self.add_cmd_output("/sbin/powermt check_registration")
-        self.add_cmd_output("/sbin/powermt display options")
-        self.add_cmd_output("/sbin/powermt display ports")
-        self.add_cmd_output("/sbin/powermt display paths")
-        self.add_cmd_output("/sbin/powermt dump")
+        self.add_cmd_output("powermt display")
+        self.add_cmd_output("powermt display dev=all")
+        self.add_cmd_output("powermt check_registration")
+        self.add_cmd_output("powermt display options")
+        self.add_cmd_output("powermt display ports")
+        self.add_cmd_output("powermt display paths")
+        self.add_cmd_output("powermt dump")
 
     def get_symcli_files(self):
         """ EMC Solutions Enabler SYMCLI specific information - files
@@ -70,51 +70,51 @@ class emc(Plugin, RedHatPlugin):
     def get_symcli_config(self):
         """ EMC Solutions Enabler SYMCLI specific information - Symmetrix/DMX - commands
         """
-        self.add_cmd_output("/usr/symcli/bin/symcli -def")
-        self.add_cmd_output("/usr/symcli/bin/symdg list")
-        self.add_cmd_output("/usr/symcli/bin/symdg -v list")
-        self.add_cmd_output("/usr/symcli/bin/symcg list")
-        self.add_cmd_output("/usr/symcli/bin/symcg -v list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -v list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -db")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -semaphores list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -dir all -v list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -connections list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -app -v list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -fa all -port list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -ra all -port list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg -sa all -port list")
-        self.add_cmd_output("/usr/symcli/bin/symcfg list -lock")
-        self.add_cmd_output("/usr/symcli/bin/symcfg list -lockn all")
-        self.add_cmd_output("/usr/symcli/bin/syminq")
-        self.add_cmd_output("/usr/symcli/bin/syminq -v")
-        self.add_cmd_output("/usr/symcli/bin/syminq -symmids")
-        self.add_cmd_output("/usr/symcli/bin/syminq hba -fibre")
-        self.add_cmd_output("/usr/symcli/bin/syminq hba -scsi")
-        self.add_cmd_output("/usr/symcli/bin/symhost show -config")
-        self.add_cmd_output("/usr/symcli/bin/stordaemon list")
-        self.add_cmd_output("/usr/symcli/bin/stordaemon -v list")
-        self.add_cmd_output("/usr/symcli/bin/sympd list")
-        self.add_cmd_output("/usr/symcli/bin/sympd list -vcm")
-        self.add_cmd_output("/usr/symcli/bin/symdev list")
-        self.add_cmd_output("/usr/symcli/bin/symdev -v list")
-        self.add_cmd_output("/usr/symcli/bin/symdev -rdfa list")
-        self.add_cmd_output("/usr/symcli/bin/symdev -rdfa -v list")
-        self.add_cmd_output("/usr/symcli/bin/symbcv list")
-        self.add_cmd_output("/usr/symcli/bin/symbcv -v list")
-        self.add_cmd_output("/usr/symcli/bin/symrdf list")
-        self.add_cmd_output("/usr/symcli/bin/symrdf -v list")
-        self.add_cmd_output("/usr/symcli/bin/symrdf -rdfa list")
-        self.add_cmd_output("/usr/symcli/bin/symrdf -rdfa -v list")
-        self.add_cmd_output("/usr/symcli/bin/symsnap list")
-        self.add_cmd_output("/usr/symcli/bin/symsnap list -savedevs")
-        self.add_cmd_output("/usr/symcli/bin/symclone list")
-        self.add_cmd_output("/usr/symcli/bin/symevent list")
-        self.add_cmd_output("/usr/symcli/bin/symmask list hba")
-        self.add_cmd_output("/usr/symcli/bin/symmask list logins")
-        self.add_cmd_output("/usr/symcli/bin/symmaskdb list database")
-        self.add_cmd_output("/usr/symcli/bin/symmaskdb -v list database")
+        self.add_cmd_output("/usr/symclisymcli -def")
+        self.add_cmd_output("/usr/symclisymdg list")
+        self.add_cmd_output("/usr/symclisymdg -v list")
+        self.add_cmd_output("/usr/symclisymcg list")
+        self.add_cmd_output("/usr/symclisymcg -v list")
+        self.add_cmd_output("/usr/symclisymcfg list")
+        self.add_cmd_output("/usr/symclisymcfg -v list")
+        self.add_cmd_output("/usr/symclisymcfg -db")
+        self.add_cmd_output("/usr/symclisymcfg -semaphores list")
+        self.add_cmd_output("/usr/symclisymcfg -dir all -v list")
+        self.add_cmd_output("/usr/symclisymcfg -connections list")
+        self.add_cmd_output("/usr/symclisymcfg -app -v list")
+        self.add_cmd_output("/usr/symclisymcfg -fa all -port list")
+        self.add_cmd_output("/usr/symclisymcfg -ra all -port list")
+        self.add_cmd_output("/usr/symclisymcfg -sa all -port list")
+        self.add_cmd_output("/usr/symclisymcfg list -lock")
+        self.add_cmd_output("/usr/symclisymcfg list -lockn all")
+        self.add_cmd_output("/usr/symclisyminq")
+        self.add_cmd_output("/usr/symclisyminq -v")
+        self.add_cmd_output("/usr/symclisyminq -symmids")
+        self.add_cmd_output("/usr/symclisyminq hba -fibre")
+        self.add_cmd_output("/usr/symclisyminq hba -scsi")
+        self.add_cmd_output("/usr/symclisymhost show -config")
+        self.add_cmd_output("/usr/symclistordaemon list")
+        self.add_cmd_output("/usr/symclistordaemon -v list")
+        self.add_cmd_output("/usr/symclisympd list")
+        self.add_cmd_output("/usr/symclisympd list -vcm")
+        self.add_cmd_output("/usr/symclisymdev list")
+        self.add_cmd_output("/usr/symclisymdev -v list")
+        self.add_cmd_output("/usr/symclisymdev -rdfa list")
+        self.add_cmd_output("/usr/symclisymdev -rdfa -v list")
+        self.add_cmd_output("/usr/symclisymbcv list")
+        self.add_cmd_output("/usr/symclisymbcv -v list")
+        self.add_cmd_output("/usr/symclisymrdf list")
+        self.add_cmd_output("/usr/symclisymrdf -v list")
+        self.add_cmd_output("/usr/symclisymrdf -rdfa list")
+        self.add_cmd_output("/usr/symclisymrdf -rdfa -v list")
+        self.add_cmd_output("/usr/symclisymsnap list")
+        self.add_cmd_output("/usr/symclisymsnap list -savedevs")
+        self.add_cmd_output("/usr/symclisymclone list")
+        self.add_cmd_output("/usr/symclisymevent list")
+        self.add_cmd_output("/usr/symclisymmask list hba")
+        self.add_cmd_output("/usr/symclisymmask list logins")
+        self.add_cmd_output("/usr/symclisymmaskdb list database")
+        self.add_cmd_output("/usr/symclisymmaskdb -v list database")
 
     def get_navicli_config(self):
         """ EMC Navisphere Host Agent NAVICLI specific information - files
@@ -129,19 +129,19 @@ class emc(Plugin, RedHatPlugin):
     def get_navicli_SP_info(self,SP_address):
         """ EMC Navisphere Host Agent NAVICLI specific information - CLARiiON - commands
         """
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getall" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getsptime -spa" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getsptime -spb" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getlog" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getdisk" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getcache" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getlun" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s lunmapinfo" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s getcrus" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s port -list -all" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s storagegroup -list" % SP_address)
-        self.add_cmd_output("/opt/Navisphere/bin/navicli -h %s spportspeed -get" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getall" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getsptime -spa" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getsptime -spb" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getlog" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getdisk" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getcache" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getlun" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s lunmapinfo" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s getcrus" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s port -list -all" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s storagegroup -list" % SP_address)
+        self.add_cmd_output("/opt/Navispherenavicli -h %s spportspeed -get" % SP_address)
 
     def check_enabled(self):
         self.packages = [ "EMCpower" ]
@@ -194,7 +194,7 @@ class emc(Plugin, RedHatPlugin):
             while CLARiiON_IP_loop == "stay_in":
                 ans = raw_input("CLARiiON SP IP Address or [Enter] to exit: ")
                 ## Check to make sure the CLARiiON SP IP address provided is valid
-                p = Popen("/opt/Navisphere/bin/navicli -h %s getsptime" % (ans,), shell=True, stdout=PIPE, stderr=PIPE)
+                p = Popen("/opt/Navispherenavicli -h %s getsptime" % (ans,), shell=True, stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
                 if p.returncode == 0:
                     CLARiiON_IP_address_list.append(ans)
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index 5409320f..e5d63dfa 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -32,15 +32,15 @@ class filesys(Plugin, RedHatPlugin, UbuntuPlugin):
             "/proc/mdstat",
             "/etc/raidtab",
             "/etc/mdadm.conf"])
-        mounts = self.get_cmd_output_now("/bin/mount -l", root_symlink = "mount")
+        mounts = self.get_cmd_output_now("mount -l", root_symlink = "mount")
 
-        self.add_cmd_output("/bin/findmnt")
-        self.add_cmd_output("/bin/df -al", root_symlink = "df")
-        self.add_cmd_output("/bin/df -ali")
+        self.add_cmd_output("findmnt")
+        self.add_cmd_output("df -al", root_symlink = "df")
+        self.add_cmd_output("df -ali")
         if self.get_option('lsof'):
-            self.add_cmd_output("/usr/sbin/lsof -b +M -n -l -P", root_symlink = "lsof")
-        self.add_cmd_output("/sbin/blkid -c /dev/null")
-        self.add_cmd_output("/usr/bin/lsblk")
+            self.add_cmd_output("lsof -b +M -n -l -P", root_symlink = "lsof")
+        self.add_cmd_output("blkid -c /dev/null")
+        self.add_cmd_output("lsblk")
 
         part_titlep = re.compile("^major")
         blankp = re.compile("^$")
@@ -53,9 +53,9 @@ class filesys(Plugin, RedHatPlugin, UbuntuPlugin):
                 partlist.append('/dev/' + line.split()[-1])
         except IOError:
             exit(1)
-        if os.path.exists("/sbin/hdparm"):
+        if os.path.exists("hdparm"):
             for dev in partlist:
-                ret, hdparm, time = self.call_ext_prog('/sbin/hdparm -g %s' %(dev))
+                ret, hdparm, time = self.call_ext_prog('hdparm -g %s' %(dev))
                 if(ret == 0):
                     start_geo = hdparm.strip().split("\n")[-1].strip().split()[-1]
                     if(start_geo == "0"):
@@ -69,8 +69,8 @@ class filesys(Plugin, RedHatPlugin, UbuntuPlugin):
                     devlist.append(dev)
 
         for i in devlist:
-            self.add_cmd_output("/sbin/parted -s %s print" % (i))
+            self.add_cmd_output("parted -s %s print" % (i))
 
         if self.get_option('dumpe2fs'):
             for extfs in izip(self.do_regex_find_all(r"^(/dev/.+) on .+ type ext.\s+", mounts)):
-                self.add_cmd_output("/sbin/dumpe2fs %s" % (extfs))
+                self.add_cmd_output("dumpe2fs %s" % (extfs))
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 1ee9c909..2bbf3203 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -42,19 +42,19 @@ class General(Plugin):
             "/root/anaconda-ks.cfg"])
 
         limit = self.get_option("syslogsize")
-        self.add_cmd_output("/bin/dmesg", suggest_filename="dmesg_now")
+        self.add_cmd_output("dmesg", suggest_filename="dmesg_now")
         self.add_copy_spec_limit("/var/log/messages*", sizelimit = limit)
         self.add_copy_spec_limit("/var/log/secure*", sizelimit = limit)
-        self.add_cmd_output("/usr/bin/hostid")
-        self.add_cmd_output("/bin/hostname", root_symlink="hostname")
-        self.add_cmd_output("/bin/date", root_symlink="date")
-        self.add_cmd_output("/usr/bin/uptime", root_symlink="uptime")
-        self.add_cmd_output("/bin/dmesg")
-        self.add_cmd_output("/usr/sbin/alternatives --display java",
+        self.add_cmd_output("hostid")
+        self.add_cmd_output("hostname", root_symlink="hostname")
+        self.add_cmd_output("date", root_symlink="date")
+        self.add_cmd_output("uptime", root_symlink="uptime")
+        self.add_cmd_output("dmesg")
+        self.add_cmd_output("alternatives --display java",
                                 root_symlink="java")
-        self.add_cmd_output("/usr/bin/readlink -f /usr/bin/java")
-        self.add_cmd_output("/usr/bin/tree /var/lib")
-        self.add_cmd_output("/bin/ls -lR /var/lib")
+        self.add_cmd_output("readlink -f /usrjava")
+        self.add_cmd_output("tree /var/lib")
+        self.add_cmd_output("ls -lR /var/lib")
 
 
 class RedHatGeneral(General, RedHatPlugin):
@@ -122,4 +122,4 @@ class UbuntuGeneral(General, UbuntuPlugin):
 	    "/var/log/unattended-upgrades",
 	    "/var/log/upstart"
         ])
-        self.add_cmd_output("/usr/sbin/ufw app list",root_symlink="ufw")
+        self.add_cmd_output("ufw app list",root_symlink="ufw")
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index 6383938b..b5670993 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -76,7 +76,7 @@ class gluster(Plugin, RedHatPlugin):
             pass
 
     def setup(self):
-        self.add_cmd_output("/usr/sbin/gluster peer status")
+        self.add_cmd_output("gluster peer status")
 
         # check package version handling rename of glusterfs-core -> glusterfs
         pkg = self.policy().pkg_by_name("glusterfs-core");
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index ef6359ff..10601f67 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -45,31 +45,31 @@ class hardware(Plugin):
             "/sys/state",
             "/sys/firmware/acpi/tables",
             "/var/log/mcelog"])
-        self.add_cmd_output("""/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.add_cmd_output("""echo -e "lspci:\n" ; lspci ; echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci")
 
-        self.add_cmd_output("/usr/sbin/dmidecode", root_symlink = "dmidecode")
+        self.add_cmd_output("dmidecode", root_symlink = "dmidecode")
 
-	if os.path.exists("/usr/bin/cpufreq-info"):
-	        self.add_cmd_output("/usr/bin/cpufreq-info")
-	if os.path.exists("/usr/bin/cpupower"):
-		self.add_cmd_output("/usr/bin/cpupower info")
-		self.add_cmd_output("/usr/bin/cpupower frequency-info")
+	if os.path.exists("cpufreq-info"):
+	        self.add_cmd_output("cpufreq-info")
+	if os.path.exists("cpupower"):
+		self.add_cmd_output("cpupower info")
+		self.add_cmd_output("cpupower frequency-info")
 
         if self.policy().get_arch().endswith("386"):
-            self.add_cmd_output("/usr/sbin/x86info -a")
+            self.add_cmd_output("x86info -a")
 
-        if os.path.exists("/usr/bin/lsusb"):
-            lsusb_path = "/usr/bin/lsusb"
+        if os.path.exists("lsusb"):
+            lsusb_path = "lsusb"
         else:
-            lsusb_path = "/usr/bin/lsusb"
+            lsusb_path = "lsusb"
 
         self.add_cmd_output("%s"% lsusb_path)
         self.add_cmd_output("%s -v"% lsusb_path)
         self.add_cmd_output("%s -t"% lsusb_path)
 
-        self.add_cmd_output("/usr/bin/lshal")
-        self.add_cmd_output("/usr/bin/systool -c fc_host -v")
-        self.add_cmd_output("/usr/bin/systool -c scsi_host -v")
+        self.add_cmd_output("lshal")
+        self.add_cmd_output("systool -c fc_host -v")
+        self.add_cmd_output("systool -c scsi_host -v")
 
 class RedHatHardware(hardware, RedHatPlugin):
     """hardware related information for Red Hat distribution
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index a8a09c7c..891e71bd 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -19,4 +19,4 @@ class i18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
     def setup(self):
         self.add_copy_specs(["/etc/X11/xinit/xinput.d/*", "/etc/locale.conf"])
-        self.add_cmd_output("/usr/bin/locale")
+        self.add_cmd_output("locale")
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index 59cc5078..dcb8e44f 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -30,10 +30,10 @@ class infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/ofed/openib.conf",
             "/etc/ofed/opensm.conf"])
 
-        self.add_cmd_output("/usr/bin/ibv_devices")
-        self.add_cmd_output("/usr/bin/ibv_devinfo")
-        self.add_cmd_output("/usr/sbin/ibstat")
-        self.add_cmd_output("/usr/sbin/ibstatus")
-        self.add_cmd_output("/usr/sbin/ibhosts")
+        self.add_cmd_output("ibv_devices")
+        self.add_cmd_output("ibv_devinfo")
+        self.add_cmd_output("ibstat")
+        self.add_cmd_output("ibstatus")
+        self.add_cmd_output("ibhosts")
 
         return
diff --git a/sos/plugins/initrd.py b/sos/plugins/initrd.py
index ef6b6225..69cffb9b 100644
--- a/sos/plugins/initrd.py
+++ b/sos/plugins/initrd.py
@@ -20,7 +20,7 @@ class initrd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
     def setup(self):
         for initrd in glob('/boot/initrd-*.img'):
-            self.add_cmd_output("/bin/zcat "+initrd+" | /bin/cpio "+
+            self.add_cmd_output("zcat "+initrd+" | cpio "+
                 "--extract --to-stdout init" )
 
     def default_enabled(self):
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 2922d123..eeaf7514 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -22,21 +22,21 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     module_file = ""
 
     def setup(self):
-        self.add_cmd_output("/bin/uname -a", root_symlink = "uname")
-        self.module_file = self.get_cmd_output_now("/sbin/lsmod", root_symlink = "lsmod")
+        self.add_cmd_output("uname -a", root_symlink = "uname")
+        self.module_file = self.get_cmd_output_now("lsmod", root_symlink = "lsmod")
 
         if self.get_option('modinfo'):
             runcmd = ""
-            ret, mods, rtime = self.call_ext_prog('/sbin/lsmod | /bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null')
+            ret, mods, rtime = self.call_ext_prog('lsmod | cut -f1 -d" " 2>/dev/null | grep -v Module 2>/dev/null')
             for kmod in mods.split('\n'):
                 if '' != kmod.strip():
                     runcmd = runcmd + " " + kmod
             if len(runcmd):
-                self.add_cmd_output("/sbin/modinfo " + runcmd)
+                self.add_cmd_output("modinfo " + runcmd)
 
-        self.add_cmd_output("/sbin/sysctl -a")
-        if os.path.isfile("/sbin/ksyms"):
-            self.add_cmd_output("/sbin/ksyms")
+        self.add_cmd_output("sysctl -a")
+        if os.path.isfile("ksyms"):
+            self.add_cmd_output("ksyms")
         self.add_copy_specs([
             "/proc/sys/kernel/random/boot_id",
             "/sys/module/*/parameters",
@@ -63,4 +63,4 @@ class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/proc/timer*",
             "/proc/lock*"])
 
-        self.add_cmd_output("/usr/sbin/dkms status")
+        self.add_cmd_output("dkms status")
diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py
index a03d7e08..7d7daa16 100644
--- a/sos/plugins/kernelrt.py
+++ b/sos/plugins/kernelrt.py
@@ -32,4 +32,4 @@ class kernel_rt(Plugin, RedHatPlugin):
         self.add_copy_spec('/sys/devices/system/clocksource/clocksource0/available_clocksource')
         self.add_copy_spec('/sys/devices/system/clocksource/clocksource0/current_clocksource')
         if self.is_installed('tuna'):
-            self.add_cmd_output('/usr/bin/tuna -CP | /ust/bin/head -20')
+            self.add_cmd_output('tuna -CP | /usthead -20')
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index dbc94033..e94ac0a1 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -38,8 +38,8 @@ class kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec("/sys/module/kvm_amd/srcversion")
         self.add_copy_spec("/sys/module/ksm/srcversion")
         if self.get_option('topOutput'):
-            self.add_cmd_output("/usr/bin/top -b -d 1 -n 5")
-        self.add_cmd_output("/usr/bin/kvm_stat --once")
+            self.add_cmd_output("top -b -d 1 -n 5")
+        self.add_cmd_output("kvm_stat --once")
 
     def postproc(self):
         if self._debugfs_cleanup and os.path.ismount("/sys/kernel/debug"):
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index 32db9c82..222df5a4 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -24,5 +24,5 @@ class libraries(Plugin, RedHatPlugin, UbuntuPlugin):
     def setup(self):
         self.add_copy_specs(["/etc/ld.so.conf", "/etc/ld.so.conf.d"])
         if self.get_option("ldconfigv"):
-            self.add_cmd_output("/sbin/ldconfig -v -N -X")
-        self.add_cmd_output("/sbin/ldconfig -p -N -X")
+            self.add_cmd_output("ldconfig -v -N -X")
+        self.add_cmd_output("ldconfig -p -N -X")
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index 3ca35243..3a56a549 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -19,7 +19,7 @@ class logrotate(Plugin, RedHatPlugin):
     """
 
     def setup(self):
-        self.add_cmd_output("/usr/sbin/logrotate --debug /etc/logrotate.conf",
+        self.add_cmd_output("logrotate --debug /etc/logrotate.conf",
                               suggest_filename = "logrotate_debug")
         self.add_copy_specs([
             "/etc/logrotate*",
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index 055fbcb0..eee68e16 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -21,6 +21,6 @@ class lsbrelease(Plugin, RedHatPlugin):
     """
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/lsb_release -a")
-        self.add_cmd_output("/usr/bin/lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release")
+        self.add_cmd_output("lsb_release -a")
+        self.add_cmd_output("lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release")
         self.add_copy_spec("/etc/lsb-release*")
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
index 9d68d1f9..0ef61384 100644
--- a/sos/plugins/maas.py
+++ b/sos/plugins/maas.py
@@ -25,5 +25,5 @@ class maas(Plugin, UbuntuPlugin):
                            "/var/lib/maas",
                            "/var/log/maas*"])
         self.add_cmd_output("maas dumpdata")
-        self.add_cmd_output("/usr/bin/pg_dumpall")
+        self.add_cmd_output("pg_dumpall")
                            
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index e5efd5c2..1124b575 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -25,6 +25,6 @@ class memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/proc/slabinfo",
             "/proc/pagetypeinfo"])
 
-        self.add_cmd_output("/bin/dmesg | grep -e 'e820.' -e 'aperature.'")
-        self.add_cmd_output("/usr/bin/free", root_symlink = "free")
-        self.add_cmd_output("/usr/bin/free -m")
+        self.add_cmd_output("dmesg | grep -e 'e820.' -e 'aperature.'")
+        self.add_cmd_output("free", root_symlink = "free")
+        self.add_cmd_output("free -m")
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index 31bf29bc..2044985b 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -19,4 +19,4 @@ class mrggrid(Plugin, RedHatPlugin):
     """
     def setup(self):
         self.add_copy_spec("/etc/condor/condor_config")
-        self.add_copy_spec("/usr/bin/condor_status")
+        self.add_copy_spec("condor_status")
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index b6b104f1..3ff8fe7a 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -55,9 +55,9 @@ class networking(Plugin, RedHatPlugin):
         relevant rules in that table """
 
 
-        (status, output, time) = self.call_ext_prog("/sbin/lsmod | grep -q "+tablename)
+        (status, output, time) = self.call_ext_prog("lsmod | grep -q "+tablename)
         if status == 0:
-            cmd = "/sbin/iptables -t "+tablename+" -nvL"
+            cmd = "iptables -t "+tablename+" -nvL"
             self.add_cmd_output(cmd)
 
     def setup(self):
@@ -70,40 +70,40 @@ class networking(Plugin, RedHatPlugin):
             "/etc/xinetd.d",
             "/etc/host*",
             "/etc/resolv.conf"])
-        ip_addr_file=self.get_cmd_output_now("/sbin/ip -o addr", root_symlink = "ip_addr")
-        ip_addr_out=self.call_ext_prog("/sbin/ip -o addr")
-        self.add_cmd_output("/sbin/route -n", root_symlink = "route")
+        ip_addr_file=self.get_cmd_output_now("ip -o addr", root_symlink = "ip_addr")
+        ip_addr_out=self.call_ext_prog("ip -o addr")
+        self.add_cmd_output("route -n", root_symlink = "route")
         self.collect_iptable("filter")
         self.collect_iptable("nat")
         self.collect_iptable("mangle")
-        self.add_cmd_output("/bin/netstat -s")
-        self.add_cmd_output("/bin/netstat -agn")
-        self.add_cmd_output("/bin/netstat -neopa", root_symlink = "netstat")
-        self.add_cmd_output("/sbin/ip route show table all")
-        self.add_cmd_output("/sbin/ip -6 route show table all")
-        self.add_cmd_output("/sbin/ip link")
-        self.add_cmd_output("/sbin/ip address")
-        self.add_cmd_output("/sbin/ifenslave -a")
-        self.add_cmd_output("/sbin/ip mroute show")
-        self.add_cmd_output("/sbin/ip maddr show")
-        self.add_cmd_output("/sbin/ip neigh show")
+        self.add_cmd_output("netstat -s")
+        self.add_cmd_output("netstat -agn")
+        self.add_cmd_output("netstat -neopa", root_symlink = "netstat")
+        self.add_cmd_output("ip route show table all")
+        self.add_cmd_output("ip -6 route show table all")
+        self.add_cmd_output("ip link")
+        self.add_cmd_output("ip address")
+        self.add_cmd_output("ifenslave -a")
+        self.add_cmd_output("ip mroute show")
+        self.add_cmd_output("ip maddr show")
+        self.add_cmd_output("ip neigh show")
         if ip_addr_out:
             for eth in self.get_interface_name(ip_addr_out):
-                self.add_cmd_output("/sbin/ethtool "+eth)
-                self.add_cmd_output("/sbin/ethtool -i "+eth)
-                self.add_cmd_output("/sbin/ethtool -k "+eth)
-                self.add_cmd_output("/sbin/ethtool -S "+eth)
-                self.add_cmd_output("/sbin/ethtool -a "+eth)
-                self.add_cmd_output("/sbin/ethtool -c "+eth)
-                self.add_cmd_output("/sbin/ethtool -g "+eth)
+                self.add_cmd_output("ethtool "+eth)
+                self.add_cmd_output("ethtool -i "+eth)
+                self.add_cmd_output("ethtool -k "+eth)
+                self.add_cmd_output("ethtool -S "+eth)
+                self.add_cmd_output("ethtool -a "+eth)
+                self.add_cmd_output("ethtool -c "+eth)
+                self.add_cmd_output("ethtool -g "+eth)
         if self.get_option("traceroute"):
-            self.add_cmd_output("/bin/traceroute -n rhn.redhat.com")
+            self.add_cmd_output("traceroute -n rhn.redhat.com")
 
-        if os.path.exists("/usr/sbin/brctl"):
-            brctl_file=self.add_cmd_output("/usr/sbin/brctl show")
-            brctl_out=self.call_ext_prog("/usr/sbin/brctl show")
+        if os.path.exists("brctl"):
+            brctl_file=self.add_cmd_output("brctl show")
+            brctl_out=self.call_ext_prog("brctl show")
             if brctl_out:
                 for br_name in self.get_bridge_name(brctl_out):
-                    self.add_cmd_output("/usr/sbin/brctl showstp "+br_name)
+                    self.add_cmd_output("brctl showstp "+br_name)
         return
 
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index 1229dcf1..abe70e1d 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -39,5 +39,5 @@ class nfsserver(Plugin, RedHatPlugin):
             "/var/lib/nfs/etab",
             "/var/lib/nfs/xtab",
             "/var/lib/nfs/rmtab"])
-        self.add_cmd_output("/usr/sbin/rpcinfo -p localhost")
-        self.add_cmd_output("/usr/sbin/nfsstat -a")
+        self.add_cmd_output("rpcinfo -p localhost")
+        self.add_cmd_output("nfsstat -a")
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index c87a61b1..45f428d9 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -21,5 +21,5 @@ class ntp(Plugin, RedHatPlugin):
     packages = ('ntp',)
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/ntpstat")
-        self.add_cmd_output("/usr/sbin/ntptime")
+        self.add_cmd_output("ntpstat")
+        self.add_cmd_output("ntptime")
diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py
index b6ea1756..7e8ba0fa 100644
--- a/sos/plugins/openstack.py
+++ b/sos/plugins/openstack.py
@@ -88,30 +88,30 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
 
     def setup(self):
         # Nova
-        if os.path.exists("/usr/bin/nova-manage"):
+        if os.path.exists("nova-manage"):
             self.add_cmd_output(
-                "/usr/bin/nova-manage config list 2>/dev/null | sort",
+                "nova-manage config list 2>/dev/null | sort",
                 suggest_filename="nova_config_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage service list 2>/dev/null",
+                "nova-manage service list 2>/dev/null",
                 suggest_filename="nova_service_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage db version 2>/dev/null",
+                "nova-manage db version 2>/dev/null",
                 suggest_filename="nova_db_version")
             self.add_cmd_output(
-                "/usr/bin/nova-manage fixed list 2>/dev/null",
+                "nova-manage fixed list 2>/dev/null",
                 suggest_filename="nova_fixed_ip_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage floating list 2>/dev/null",
+                "nova-manage floating list 2>/dev/null",
                 suggest_filename="nova_floating_ip_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage flavor list 2>/dev/null",
+                "nova-manage flavor list 2>/dev/null",
                 suggest_filename="nova_flavor_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage network list 2>/dev/null",
+                "nova-manage network list 2>/dev/null",
                 suggest_filename="nova_network_list")
             self.add_cmd_output(
-                "/usr/bin/nova-manage vm list 2>/dev/null",
+                "nova-manage vm list 2>/dev/null",
                 suggest_filename="nova_vm_list")
         self.add_copy_specs(["/etc/nova/",
                            "/var/log/nova/",
@@ -119,9 +119,9 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
                            "/etc/sudoers.d/nova_sudoers",
                            "/etc/logrotate.d/nova-*"])
         # Glance
-        if os.path.exists("/usr/bin/glance-manage"):
+        if os.path.exists("glance-manage"):
             self.add_cmd_output(
-                "/usr/bin/glance-manage db_version",
+                "glance-manage db_version",
                 suggest_filename="glance_db_version")
         self.add_copy_specs(["/etc/glance/",
                            "/var/log/glance/",
@@ -163,7 +163,7 @@ class RedHatOpenStack(openstack, RedHatPlugin):
         # If RHEL or Fedora then invoke script for openstack-status
         if (os.path.isfile('/etc/redhat-release')
             or os.path.isfile('/etc/fedora-release')):
-            self.add_cmd_output("/usr/bin/openstack-status")
+            self.add_cmd_output("openstack-status")
 
         # Nova
         self.add_copy_specs(["/etc/nova/",
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index 6d17136d..d57a8db6 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -28,5 +28,5 @@ class openswan(Plugin, RedHatPlugin):
         self.add_copy_specs([
             "/etc/ipsec.conf",
             "/etc/ipsec.d"])
-        self.add_cmd_output("/usr/sbin/ipsec verify")
-        self.add_cmd_output("/usr/sbin/ipsec barf")
+        self.add_cmd_output("ipsec verify")
+        self.add_cmd_output("ipsec barf")
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 5ebff028..701f0c8b 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -20,4 +20,4 @@ class pam(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/pam.d")
         self.add_copy_spec("/etc/security")
-        self.add_cmd_output("/bin/ls -lanF /lib*/security")
+        self.add_cmd_output("ls -lanF /lib*/security")
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index 0d7a671c..d2c3c8fc 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -27,4 +27,4 @@ class postfix(Plugin, RedHatPlugin):
             "/etc/mail",
             "/etc/postfix/main.cf",
             "/etc/postfix/master.cf"])
-        self.add_cmd_output("/usr/sbin/postconf")
+        self.add_cmd_output("postconf")
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index 8f04a3f4..207071c5 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -29,4 +29,4 @@ class ppp(Plugin, RedHatPlugin):
             "/etc/wvdial.conf",
             "/etc/ppp",
             "/var/log/ppp"])
-        self.add_cmd_output("/usr/sbin/adsl-status")
+        self.add_cmd_output("adsl-status")
diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py
index fc85af22..45bea20a 100644
--- a/sos/plugins/printing.py
+++ b/sos/plugins/printing.py
@@ -26,6 +26,6 @@ class printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/cups/lpoptions",
             "/etc/cups/ppd/*.ppd"])
         self.add_copy_spec_limit("/var/log/cups", sizelimit=self.option_enabled("cupslogsize"))
-        self.add_cmd_output("/usr/bin/lpstat -t")
-        self.add_cmd_output("/usr/bin/lpstat -s")
-        self.add_cmd_output("/usr/bin/lpstat -d")
+        self.add_cmd_output("lpstat -t")
+        self.add_cmd_output("lpstat -s")
+        self.add_cmd_output("lpstat -d")
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index f90dab83..83e8f588 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -20,11 +20,11 @@ class process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """process information
     """
     def setup(self):
-        self.add_cmd_output("/bin/ps auxwww", root_symlink = "ps")
-        self.add_cmd_output("/bin/ps auxwwwm")
-        self.add_cmd_output("/bin/ps alxwww")
-        self.add_cmd_output("/usr/bin/pstree", root_symlink = "pstree")
-        self.add_cmd_output("/usr/sbin/lsof -b +M -n -l", root_symlink = "lsof")
+        self.add_cmd_output("ps auxwww", root_symlink = "ps")
+        self.add_cmd_output("ps auxwwwm")
+        self.add_cmd_output("ps alxwww")
+        self.add_cmd_output("pstree", root_symlink = "pstree")
+        self.add_cmd_output("lsof -b +M -n -l", root_symlink = "lsof")
 
     def find_mountpoint(s):
         if (os.path.ismount(s) or len(s)==0): return s
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index 4cdd2f76..082db155 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -20,11 +20,11 @@ class pxe(Plugin, RedHatPlugin):
     """
 
     option_list = [("tftpboot", 'gathers content in /tftpboot', 'slow', False)]
-    files = ('/usr/sbin/pxeos',)
+    files = ('pxeos',)
     packages = ('system-config-netboot-cmd',)
 
     def setup(self):
-        self.add_cmd_output("/usr/sbin/pxeos -l")
+        self.add_cmd_output("pxeos -l")
         self.add_copy_spec("/etc/dhcpd.conf")
         if self.get_option("tftpboot"):
             self.add_copy_spec("/tftpboot")
diff --git a/sos/plugins/qpidd.py b/sos/plugins/qpidd.py
index a59251bf..8c3820d4 100644
--- a/sos/plugins/qpidd.py
+++ b/sos/plugins/qpidd.py
@@ -22,15 +22,15 @@ class qpidd(Plugin, RedHatPlugin):
 
     def setup(self):
         """ performs data collection for mrg """
-        self.add_cmd_output("/usr/bin/qpid-stat -e")
-        self.add_cmd_output("/usr/bin/qpid-stat -b")
-        self.add_cmd_output("/usr/bin/qpid-config")
-        self.add_cmd_output("/usr/bin/qpid-config -b exchanges")
-        self.add_cmd_output("/usr/bin/qpid-config -b queues")
-        self.add_cmd_output("/usr/bin/qpid-stat -c")
-        self.add_cmd_output("/usr/bin/qpid-route link list")
-        self.add_cmd_output("/usr/bin/qpid-route route list")
-        self.add_cmd_output("/bin/ls -lanR /var/lib/qpidd")
+        self.add_cmd_output("qpid-stat -e")
+        self.add_cmd_output("qpid-stat -b")
+        self.add_cmd_output("qpid-config")
+        self.add_cmd_output("qpid-config -b exchanges")
+        self.add_cmd_output("qpid-config -b queues")
+        self.add_cmd_output("qpid-stat -c")
+        self.add_cmd_output("qpid-route link list")
+        self.add_cmd_output("qpid-route route list")
+        self.add_cmd_output("ls -lanR /var/lib/qpidd")
 
         self.add_copy_specs([
             "/etc/qpidd.conf",
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py
index 0686c8bd..73e6c0e7 100644
--- a/sos/plugins/rhn.py
+++ b/sos/plugins/rhn.py
@@ -66,16 +66,16 @@ class rhn(Plugin, RedHatPlugin):
             "/var/log/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log"])
 
         self.add_copy_spec("/root/ssl-build")
-        self.add_cmd_output("/usr/bin/rhn-schema-version",
+        self.add_cmd_output("rhn-schema-version",
                         root_symlink = "database-schema-version")
-        self.add_cmd_output("/usr/bin/rhn-charsets",
+        self.add_cmd_output("rhn-charsets",
                         root_symlink = "database-character-sets")
 
         if self.satellite:
             self.add_copy_specs(["/etc/tnsnames.ora", "/etc/jabberd",
                                 "/etc/tomcat6/", "/var/log/tomcat6/"])
-            if os.path.exists("/usr/bin/spacewalk-debug"):
-                self.add_cmd_output("/usr/bin/spacewalk-debug --dir %s"
+            if os.path.exists("spacewalk-debug"):
+                self.add_cmd_output("spacewalk-debug --dir %s"
                         % os.path.join(self.commons['dstroot'],
                                 "sos_commands/rhn"))
 
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 3acf7ec1..02a0de69 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -24,12 +24,12 @@ class rpm(Plugin, RedHatPlugin):
         self.add_copy_spec("/var/log/rpmpkgs")
 
         if self.get_option("rpmq"):
-            self.add_cmd_output("/bin/rpm -qa --qf="
+            self.add_cmd_output("rpm -qa --qf="
                 "\"%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}~~"
                 "%{INSTALLTIME:date}\t%{INSTALLTIME}\t%{VENDOR}\n\""
-                " --nosignature --nodigest | /bin/awk -F '~~' "
+                " --nosignature --nodigest | awk -F '~~' "
                 "'{printf \"%-59s %s\\n\",$1,$2}'|sort",
                 root_symlink = "installed-rpms")
 
         if self.get_option("rpmva"):
-            self.add_cmd_output("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600)
+            self.add_cmd_output("rpm -Va", root_symlink = "rpm-Va", timeout = 3600)
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 5b5e8274..26698ebc 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -51,20 +51,20 @@ class s390(Plugin, RedHatPlugin):
             "/etc/src_vipa.conf",
             "/etc/ccwgroup.conf",
             "/etc/chandev.conf"])
-        self.add_cmd_output("/sbin/lscss")
-        self.add_cmd_output("/sbin/lsdasd")
-        self.add_cmd_output("/sbin/lstape")
+        self.add_cmd_output("lscss")
+        self.add_cmd_output("lsdasd")
+        self.add_cmd_output("lstape")
         self.add_cmd_output("find /sys -type f")
         self.add_cmd_output("find /proc/s390dbf -type f")
-        self.add_cmd_output("/sbin/qethconf list_all")
-        ret, dasd_dev, rtime = self.call_ext_prog("/bin/ls /dev/dasd?")
+        self.add_cmd_output("qethconf list_all")
+        ret, dasd_dev, rtime = self.call_ext_prog("ls /dev/dasd?")
         for x in dasd_dev.split('\n'):
-            self.add_cmd_output("/sbin/dasdview -x -i -j -l -f %s" % (x,))
-            self.add_cmd_output("/sbin/fdasd -p %s" % (x,))
+            self.add_cmd_output("dasdview -x -i -j -l -f %s" % (x,))
+            self.add_cmd_output("fdasd -p %s" % (x,))
         try:
             rhelver = self.policy().rhel_version()
             if rhelver == 5:
-                self.add_cmd_output("/sbin/lsqeth")
-                self.add_cmd_output("/sbin/lszfcp")
+                self.add_cmd_output("lsqeth")
+                self.add_cmd_output("lszfcp")
         except:
             rhelver = None
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index 10153343..23f3d7b4 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -23,6 +23,6 @@ class samba(Plugin, RedHatPlugin):
             "/var/log/samba/*",
             "/etc/krb5.conf",
             "/etc/krb5.keytab"])
-        self.add_cmd_output("/usr/bin/wbinfo -g")
-        self.add_cmd_output("/usr/bin/wbinfo -u")
-        self.add_cmd_output("/usr/bin/testparm -s -v")
+        self.add_cmd_output("wbinfo -g")
+        self.add_cmd_output("wbinfo -u")
+        self.add_cmd_output("testparm -s -v")
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 5a00372e..8bb9c37f 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -20,7 +20,7 @@ class sar(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     sapath='/var/log/sa'
-    sarcmd='/usr/bin/sar'
+    sarcmd='sar'
     files = (sapath, sarcmd)
 
     def setup(self):
@@ -51,7 +51,7 @@ class sar(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             if fname[0:2] == 'sa' and fname[2] != 'r':
                 sar_filename = 'sar' + fname[2:4]
                 if sar_filename not in dir_list:
-                    sar_command = "/bin/sh -c \"LANG=C /usr/bin/sar " \
+                    sar_command = "sh -c \"LANG=C sar " \
                             + "-A -f /var/log/sa/" + fname + "\""
                     self.add_cmd_output(sar_command, sar_filename)
         self.add_copy_spec("/var/log/sa/sar*")
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index 9c6601d7..bbcf7b71 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -22,7 +22,7 @@ class selinux(Plugin, RedHatPlugin):
         # sestatus is always collected in check_enabled()
         self.add_copy_spec("/etc/selinux")
         if self.get_option('fixfiles'):
-            self.add_cmd_output("/sbin/fixfiles check")
+            self.add_cmd_output("fixfiles check")
         self.add_forbidden_path("/etc/selinux/targeted")
 
         if not self.policy().pkg_by_name('setroubleshoot'):
@@ -39,7 +39,7 @@ class selinux(Plugin, RedHatPlugin):
                               "possible fixes stated in the sealert output.")
     def check_enabled(self):
         try:
-            if self.get_cmd_output_now("/usr/sbin/sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled":
+            if self.get_cmd_output_now("sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled":
                 return False
         except:
             pass
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 0488f019..6975b0aa 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -30,6 +30,6 @@ class smartcard(Plugin, RedHatPlugin):
             "/etc/reader.conf",
             "/etc/reader.conf.d/",
             "/etc/pam_pkcs11/"])
-        self.add_cmd_output("/usr/bin/pkcs11_inspect debug")
-        self.add_cmd_output("/usr/bin/pklogin_finder debug")
-        self.add_cmd_output("/bin/ls -nl /usr/lib*/pam_pkcs11/")
+        self.add_cmd_output("pkcs11_inspect debug")
+        self.add_cmd_output("pklogin_finder debug")
+        self.add_cmd_output("ls -nl /usr/lib*/pam_pkcs11/")
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index c52c57c4..0a01499c 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -27,8 +27,8 @@ class soundcard(Plugin, RedHatPlugin):
             "/proc/asound/*",
             "/etc/alsa/*",
             "/etc/asound.*"])
-        self.add_cmd_output("/sbin/lspci | grep -i audio")
-        self.add_cmd_output("/usr/bin/aplay -l")
-        self.add_cmd_output("/usr/bin/aplay -L")
-        self.add_cmd_output("/usr/bin/amixer")
-        self.add_cmd_output("/sbin/lsmod | /bin/grep snd | /bin/awk '{print $1}'", suggest_filename = "sndmodules_loaded")
+        self.add_cmd_output("lspci | grep -i audio")
+        self.add_cmd_output("aplay -l")
+        self.add_cmd_output("aplay -L")
+        self.add_cmd_output("amixer")
+        self.add_cmd_output("lsmod | grep snd | awk '{print $1}'", suggest_filename = "sndmodules_loaded")
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index 70f8966a..18326f35 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -22,7 +22,7 @@ class startup(Plugin, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/rc.d")
 
-        self.add_cmd_output("/sbin/chkconfig --list", root_symlink = "chkconfig")
+        self.add_cmd_output("chkconfig --list", root_symlink = "chkconfig")
         if self.get_option('servicestatus'):
-            self.add_cmd_output("/sbin/service --status-all")
-        self.add_cmd_output("/sbin/runlevel")
+            self.add_cmd_output("service --status-all")
+        self.add_cmd_output("runlevel")
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index a59fa678..12277513 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -30,7 +30,7 @@ class sunrpc(Plugin):
         return False
 
     def setup(self):
-        self.add_cmd_output("/usr/sbin/rpcinfo -p localhost")
+        self.add_cmd_output("rpcinfo -p localhost")
         return
 
 class RedHatSunrpc(sunrpc, RedHatPlugin):
@@ -48,7 +48,7 @@ class RedHatSunrpc(sunrpc, RedHatPlugin):
 #    service = 'rpcbind-boot'
 #
 #    def setup(self):
-#        self.add_cmd_output("/usr/sbin/rpcinfo -p localhost")
+#        self.add_cmd_output("rpcinfo -p localhost")
 #        return
 
 
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index f9e1e4d5..a3a76767 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -37,7 +37,7 @@ class RedHatSystem(system, RedHatPlugin):
         self.add_forbidden_path(
                 "/proc/sys/net/ipv6/neigh/*/base_reachable_time")
 
-        self.add_cmd_output("/usr/bin/crontab -l")
+        self.add_cmd_output("crontab -l")
 
 class DebianSystem(system, DebianPlugin, UbuntuPlugin):
     """core system related information for Debian and Ubuntu
@@ -55,5 +55,5 @@ class DebianSystem(system, DebianPlugin, UbuntuPlugin):
         self.add_forbidden_path(
                 "/proc/sys/net/ipv6/neigh/*/base_reachable_time")
 
-        self.add_cmd_output("/usr/bin/crontab -l")
+        self.add_cmd_output("crontab -l")
         
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 23ccddc1..039a9b91 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -20,9 +20,9 @@ class systemtap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """SystemTap information
     """
 
-    files = ('/usr/bin/stap',)
+    files = ('stap',)
     packages = ('systemtap', 'systemtap-runtime')
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/stap -V 2")
-        self.add_cmd_output("/bin/uname -r")
+        self.add_cmd_output("stap -V 2")
+        self.add_cmd_output("uname -r")
diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py
index 8cb3b4aa..f1089495 100644
--- a/sos/plugins/sysvipc.py
+++ b/sos/plugins/sysvipc.py
@@ -26,4 +26,4 @@ class sysvipc(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
                 "/proc/sysvipc/msg",
                 "/proc/sysvipc/sem",
                 "/proc/sysvipc/shm"])
-        self.add_cmd_output("/usr/bin/ipcs")
+        self.add_cmd_output("ipcs")
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index 9374642d..29324e42 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -25,4 +25,4 @@ class tftpserver(Plugin, RedHatPlugin):
     packages = ('tftp-server',)
 
     def setup(self):
-        self.add_cmd_output("/bin/ls -lanR /tftpboot")
+        self.add_cmd_output("ls -lanR /tftpboot")
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 7836c7e8..7e102c73 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -19,10 +19,10 @@ class vmware(Plugin, RedHatPlugin):
     """VMWare related information
     """
 
-    files = ('/usr/bin/vmware','/usr/init.d/vmware-tools')
+    files = ('vmware','/usr/init.d/vmware-tools')
 
     def setup(self):
-        self.add_cmd_output("/usr/bin/vmware -v")
+        self.add_cmd_output("vmware -v")
         self.add_copy_specs(["/etc/vmware/locations",
                            "/etc/vmware/config",
                            "/proc/vmmemctl"])
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index a8b1110e..2a70a905 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -49,9 +49,9 @@ class xen(Plugin, RedHatPlugin):
             "/proc/xen/xsd_kva",
             "/proc/xen/xsd_port"])
         # determine if CPU has PAE support
-        self.add_cmd_output("/bin/grep pae /proc/cpuinfo")
+        self.add_cmd_output("grep pae /proc/cpuinfo")
         # determine if CPU has Intel-VT or AMD-V support
-        self.add_cmd_output("/bin/egrep -e 'vmx|svm' /proc/cpuinfo")
+        self.add_cmd_output("egrep -e 'vmx|svm' /proc/cpuinfo")
 
     def setup(self):
         host_type = self.determine_xen_host()
@@ -73,15 +73,15 @@ class xen(Plugin, RedHatPlugin):
                 "/sys/hypervisor/compilation",
                 "/sys/hypervisor/properties",
                 "/sys/hypervisor/type"])
-            self.add_cmd_output("/usr/sbin/xm dmesg")
-            self.add_cmd_output("/usr/sbin/xm info")
-            self.add_cmd_output("/usr/sbin/xm list")
-            self.add_cmd_output("/usr/sbin/xm list --long")
-            self.add_cmd_output("/usr/sbin/brctl show")
+            self.add_cmd_output("xm dmesg")
+            self.add_cmd_output("xm info")
+            self.add_cmd_output("xm list")
+            self.add_cmd_output("xm list --long")
+            self.add_cmd_output("brctl show")
             self.dom_collect_proc()
             if self.is_running_xenstored():
                 self.add_copy_spec("/sys/hypervisor/uuid")
-                self.add_cmd_output("/usr/bin/xenstore-ls")
+                self.add_cmd_output("xenstore-ls")
             else:
                 # we need tdb instead of xenstore-ls if cannot get it.
                 self.add_copy_spec("/var/lib/xenstored/tdb")
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 17684f21..6f44fe42 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -35,7 +35,7 @@ class yum(Plugin, RedHatPlugin):
             "/var/log/yum.log"])
 
         # Get a list of channels the machine is subscribed to.
-        self.add_cmd_output("/usr/bin/yum -C repolist")
+        self.add_cmd_output("yum -C repolist")
 
         # candlepin info
         self.add_forbidden_path("/etc/pki/entitlements/key.pem")
@@ -52,13 +52,13 @@ class yum(Plugin, RedHatPlugin):
 
         if self.get_option("yumlist"):
             # List various information about available packages
-            self.add_cmd_output("/usr/bin/yum list")
+            self.add_cmd_output("yum list")
 
         if self.get_option("yumdebug") and self.is_installed('yum-utils'):
             # RHEL6+ alternative for this whole function:
-            # self.add_cmd_output("/usr/bin/yum-debug-dump '%s'" % os.path.join(self.commons['dstroot'],"yum-debug-dump"))
-            ret, output, rtime = self.call_ext_prog("/usr/bin/yum-debug-dump")
+            # self.add_cmd_output("yum-debug-dump '%s'" % os.path.join(self.commons['dstroot'],"yum-debug-dump"))
+            ret, output, rtime = self.call_ext_prog("yum-debug-dump")
             try:
-                self.add_cmd_output("/bin/zcat %s" % (output.split()[-1],))
+                self.add_cmd_output("zcat %s" % (output.split()[-1],))
             except IndexError:
                 pass