netperf: Use the one we build.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index 054a250cfa60f2c50dfa973275be91be6b15726d..3c1272e2228285341b2be336e2c2bccea7d6067a 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -191,7 +191,7 @@ distdir:
 
 #root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install kexec-tools-install
 
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins  tools-install 
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins  tools-install netperf-install
        rm -rf userspace/man
        rm -rf userspace/usr/share/man
        rm -rf userspace/usr/share/doc

diff --git a/root_image/debugspace/www/cgi-bin/netperf b/root_image/debugspace/www/cgi-bin/netperf
index aaab158f38361f188742ed7a06dd9cdbd701f161..34811b7d0125376e63855b7847a5129b459aacc5 100755 (executable)
--- a/root_image/debugspace/www/cgi-bin/netperf
+++ b/root_image/debugspace/www/cgi-bin/netperf
@@ -4,7 +4,7 @@ echo Content-type: text/html
 echo ""
 X=$(date "+%s")
 eval $QUERY_STRING
-/netperf -H $H -l $L
+/usr/bin/netperf -H $H -l $L
 Y=$(date "+%s")
 echo $X $Y
 

diff --git a/root_image/etc/init.d/rcS b/root_image/etc/init.d/rcS
index ac4cac12c38381f8b8389c37e8d2c7cb160b181b..973c4ee21bd508127baef043aefa4bbda26574fe 100755 (executable)
--- a/root_image/etc/init.d/rcS
+++ b/root_image/etc/init.d/rcS
@@ -9,6 +9,6 @@ let I=0x$X
 let J=0x$Y
 /sbin/ifconfig eth0 $J.0.0.$I
 
-/netserver
+/usr/bin/netserver
 
 /usr/sbin/httpd -h /www &