diff --git a/scripts/amsstat b/scripts/amsstat index 28a7ec9..cbf89f2 100755 --- a/scripts/amsstat +++ b/scripts/amsstat @@ -37,7 +37,7 @@ devstat_data_spacing=-30 lparcfg_data_spacing=-30 lparcfg_file=/proc/ppc64/lparcfg # Hardcoding pseries_platform path as amstat will be placed in bin -PSERIES_PLATFORM=/usr/sbin/pseries_platform +PSERIES_PLATFORM=pseries_platform function print_meminfo_stats { echo "System Memory Statistics:" diff --git a/scripts/bootlist b/scripts/bootlist index 65926d7..8ff9119 100755 --- a/scripts/bootlist +++ b/scripts/bootlist @@ -20,8 +20,8 @@ # author Nathan Fontenot # -OFPATHNAME=/usr/sbin/ofpathname -NVRAM=/usr/sbin/nvram +OFPATHNAME=ofpathname +NVRAM=nvram PSERIES_PLATFORM=$(dirname $0)/pseries_platform # diff --git a/scripts/ls-vdev b/scripts/ls-vdev index 56ab0d3..bae75b8 100644 --- a/scripts/ls-vdev +++ b/scripts/ls-vdev @@ -24,9 +24,9 @@ LSVDEV="ls-vdev" VERSION="0.1" -LS="/bin/ls" -GREP="/bin/grep" -SED="/bin/sed" +LS="ls" +GREP="grep" +SED="sed" PSERIES_PLATFORM=$(dirname $0)/pseries_platform usage() diff --git a/scripts/ls-veth b/scripts/ls-veth index b5db777..5d1970b 100755 --- a/scripts/ls-veth +++ b/scripts/ls-veth @@ -24,10 +24,10 @@ LSVETH="ls-veth" VERSION="0.1" -OFPATHNAME="/usr/sbin/ofpathname" -CAT="/bin/cat" -LS="/bin/ls" -SED="/bin/sed" +OFPATHNAME="ofpathname" +CAT="cat" +LS="ls" +SED="sed" PSERIES_PLATFORM=$(dirname $0)/pseries_platform usage() diff --git a/scripts/ls-vscsi b/scripts/ls-vscsi index 7d1b549..93801be 100755 --- a/scripts/ls-vscsi +++ b/scripts/ls-vscsi @@ -24,9 +24,9 @@ LSVSCSI="ls-vscsi" VERSION="0.1" -CAT="/bin/cat" -LS="/bin/ls" -SED="/bin/sed" +CAT="cat" +LS="ls" +SED="sed" PSERIES_PLATFORM=$(dirname $0)/pseries_platform usage() diff --git a/scripts/lsdevinfo b/scripts/lsdevinfo index 4ef98d7..e50f183 100755 --- a/scripts/lsdevinfo +++ b/scripts/lsdevinfo @@ -27,14 +27,14 @@ LSDEVINFO="lsdevinfo" VERSION="0.1" -OFPATHNAME="/usr/sbin/ofpathname" -CAT="/bin/cat" -LS="/bin/ls" -GREP="/bin/grep" -SED="/bin/sed" -TR="/usr/bin/tr" -OD="/usr/bin/od" -CUT="/usr/bin/cut" +OFPATHNAME="ofpathname" +CAT="cat" +LS="ls" +GREP="grep" +SED="sed" +TR="tr" +OD="od" +CUT="cut" PSERIES_PLATFORM=$(dirname $0)/pseries_platform # Usage statemnet diff --git a/scripts/ofpathname b/scripts/ofpathname index 1b2a1dd..b23811e 100755 --- a/scripts/ofpathname +++ b/scripts/ofpathname @@ -28,8 +28,8 @@ OFPATHNAME="ofpathname" VERSION="0.5" -FIND=/usr/bin/find -CAT=/bin/cat +FIND=find +CAT=cat PSERIES_PLATFORM=$(dirname $0)/pseries_platform # Find out what platfrom we are running on. Hopefully this @@ -329,7 +329,7 @@ find_dir() local fname=$2 while [[ -n $dir ]]; do - /bin/ls $dir/$fname >/dev/null 2>&1 + ls $dir/$fname >/dev/null 2>&1 if [[ $? -eq 0 ]]; then echo $dir return @@ -348,8 +348,8 @@ is_pata_dev() local this_dir=$PWD local sysfs_dir local udev_path - local udevinfo="/usr/bin/udevinfo" - local udevadm="/sbin/udevadm" + local udevinfo="udevinfo" + local udevadm="udevadm" if [[ -a $udevadm ]]; then udev_path=`$udevadm info --query=path --name=$DEVNAME` diff --git a/scripts/rtas_dump b/scripts/rtas_dump index 40f0da8..903fd56 100755 --- a/scripts/rtas_dump +++ b/scripts/rtas_dump @@ -28,7 +28,7 @@ use vars qw/ %opt /; use Getopt::Long; use File::Basename; -$re_decode = $ENV{RTAS_EVENT_DECODE} || "/usr/sbin/rtas_event_decode"; +$re_decode = $ENV{RTAS_EVENT_DECODE} || "rtas_event_decode"; # # usage statement diff --git a/scripts/update_flash b/scripts/update_flash index 8ad4da5..15085bc 100755 --- a/scripts/update_flash +++ b/scripts/update_flash @@ -463,18 +463,13 @@ file_opt=0 # Check for platform and if PowerNV call update_flash_nv # PowerNV update_flash tool -UPDATE_FLASH_NV=$(dirname $0)/update_flash_nv - . $PSERIES_PLATFORM case "$platform" in $PLATFORM_UNKNOWN | $PLATFORM_POWERKVM_GUEST) echo "update_flash: is not supported on the $platform_name platform" exit 1;; $PLATFORM_POWERNV) - if [ ! -r "$UPDATE_FLASH_NV" ]; then - error $E_PERM "Couldn't find $UPDATE_FLASH_NV file." - fi - /bin/sh $UPDATE_FLASH_NV $@ + update_flash_nv $@ exit $? esac