summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-21 22:14:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-27 07:24:29 +0000
commit2925cd9521dfa94a4f0bc872fcbe68f171f87786 (patch)
tree3fc855c0d40389e8c95301af38412065986c3252
parentd023d99274143a85f6a5f57ccdc702447284fb67 (diff)
downloadpoky-2925cd9521dfa94a4f0bc872fcbe68f171f87786.tar.gz
Revert "runqemu-export-rootfs: update location of unfsd binary"
unfsd appears to be moving around and is in sbin for at least two different users, so revert the change to expect it in bin. This reverts commit e56bda210e216251c04d872211081a89ac06dde6. (From OE-Core rev: 2e065b02a3e65c8db8a26788fdc4d7f65d5a2a8f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-export-rootfs8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 3dee131166..40ab20143f 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -46,8 +46,8 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
46fi 46fi
47. $SYSROOT_SETUP_SCRIPT 47. $SYSROOT_SETUP_SCRIPT
48 48
49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then 49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/unfsd" ]; then
50 echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/" 50 echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
51 51
52 if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then 52 if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
53 echo "Have you run 'bitbake meta-ide-support'?" 53 echo "Have you run 'bitbake meta-ide-support'?"
@@ -115,8 +115,8 @@ case "$1" in
115 fi 115 fi
116 116
117 echo "Starting User Mode nfsd" 117 echo "Starting User Mode nfsd"
118 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS" 118 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS"
119 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS 119 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS
120 if [ ! $? = 0 ]; then 120 if [ ! $? = 0 ]; then
121 echo "Error starting nfsd" 121 echo "Error starting nfsd"
122 exit 1 122 exit 1