]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
Revert "runqemu-export-rootfs: update location of unfsd binary"
authorRoss Burton <ross.burton@intel.com>
Wed, 21 Oct 2015 21:14:49 +0000 (22:14 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 27 Oct 2015 07:24:29 +0000 (07:24 +0000)
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>
scripts/runqemu-export-rootfs

index 3dee131166cc69e6e5a0fbe99286c41220044eb0..40ab20143f3f2adc10b1e5284b81fa079cc20043 100755 (executable)
@@ -46,8 +46,8 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
 fi
 . $SYSROOT_SETUP_SCRIPT
 
-if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then
-       echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
+if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/unfsd" ]; then
+       echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
 
        if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
                echo "Have you run 'bitbake meta-ide-support'?"
@@ -115,8 +115,8 @@ case "$1" in
        fi
 
        echo "Starting User Mode nfsd"
-       echo "  $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS"
-       $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS
+       echo "  $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS"
+       $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS
        if [ ! $? = 0 ]; then
                echo "Error starting nfsd"
                exit 1