1 files changed, 47 insertions, 47 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 3c77dd74cd..ca79af340d 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -40,9 +40,9 @@ NFS_EXPORT_DIR=$(cd "$2" && pwd)
 SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot 2> /dev/null`
 if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
-    echo "Error: Unable to find the oe-find-native-sysroot script"
+        echo "Error: Unable to find the oe-find-native-sysroot script"
-    echo "Did you forget to source your build environment setup script?"
+        echo "Did you forget to source your build environment setup script?"
-    exit 1
+        exit 1
 fi
 . $SYSROOT_SETUP_SCRIPT
@@ -50,9 +50,9 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
        echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
        if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
-            echo "Have you run 'bitbake meta-ide-support'?"
+                echo "Have you run 'bitbake meta-ide-support'?"
        else
-            echo "This shouldn't happen - something is missing from your toolchain installation"
+                echo "This shouldn't happen - something is missing from your toolchain installation"
        fi
        exit 1
 fi
@@ -104,53 +104,53 @@ case "$1" in
        echo "  $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"
        $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS
        if [ ! $? = 0 ]; then
-            echo "====================="
+                echo "====================="
-            echo "Error starting MOUNTD"
+                echo "Error starting MOUNTD"
-            echo "====================="
+                echo "====================="
-            ps -ef | grep -v grep | grep rpcbind 2>&1 > /dev/null
+                ps -ef | grep -v grep | grep rpcbind 2>&1 > /dev/null
-            if [ $? = 0 ] ; then
+                if [ $? = 0 ] ; then
-                echo "  If you see an error above that says:"
+                        echo "  If you see an error above that says:"
-                echo "    RPC: Authentication error; why = Client credential too weak"
+                        echo "    RPC: Authentication error; why = Client credential too weak"
-                echo "  You need to change the startup of rpcbind"
+                        echo "  You need to change the startup of rpcbind"
-                echo "  on your host by doing the following as root:"
+                        echo "  on your host by doing the following as root:"
-                echo "==============================================="
+                        echo "==============================================="
-                echo "  According to /etc/sysconfig/rpcbind, then "
+                        echo "  According to /etc/sysconfig/rpcbind, then "
-                echo "    echo RPCBIND_ARGS=-i >> /etc/sysconfig/rpcbind"
+                        echo "    echo RPCBIND_ARGS=-i >> /etc/sysconfig/rpcbind"
-                echo "  or"
+                        echo "  or"
-                echo "    echo RPCBIND_OPTIONS=-i >> /etc/sysconfig/rpcbind"
+                        echo "    echo RPCBIND_OPTIONS=-i >> /etc/sysconfig/rpcbind"
-                echo "    /etc/init.d/rpcbind restart"
+                        echo "    /etc/init.d/rpcbind restart"
-                echo "==============================================="
+                        echo "==============================================="
-                echo "For Ubuntu 11.10 hosts"
+                        echo "For Ubuntu 11.10 hosts"
-                echo "Add OPTIONS=\"-i -w\"  to /etc/default/rpcbind"
+                        echo "Add OPTIONS=\"-i -w\"  to /etc/default/rpcbind"
-                echo "sudo service portmap restart"
+                        echo "sudo service portmap restart"
-            fi
+                fi
-            exit 1
+                exit 1
        fi
        echo "Starting User Mode nfsd"
        echo "  $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"
        $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS
        if [ ! $? = 0 ]; then
-            echo "Error starting nfsd"
+                echo "Error starting nfsd"
-            exit 1
+                exit 1
        fi
        # Check to make sure everything started ok.
        if [ ! -f $MOUNTPID ]; then
-            echo "rpc.mountd did not start correctly"
+                echo "rpc.mountd did not start correctly"
-            exit 1
+                exit 1
        fi
        if [ ! -f $NFSPID ]; then
-            echo "rpc.nfsd did not start correctly"
+                echo "rpc.nfsd did not start correctly"
-            exit 1
+                exit 1
        fi
        ps -fp `cat $MOUNTPID` > /dev/null 2> /dev/null
        if [ ! $? = 0 ]; then
-            echo "rpc.mountd did not start correctly"
+                echo "rpc.mountd did not start correctly"
-            exit 1
+                exit 1
        fi
        ps -fp `cat $NFSPID` > /dev/null 2> /dev/null
        if [ ! $? = 0 ]; then
-            echo "rpc.nfsd did not start correctly"
+                echo "rpc.nfsd did not start correctly"
-            exit 1
+                exit 1
        fi
        echo " "
        echo "On your target please remember to add the following options for NFS"
@@ -158,29 +158,29 @@ case "$1" in
        ;;
  stop)
        if [ -f "$MOUNTPID" ]; then
-            echo "Stopping rpc.mountd"
+                echo "Stopping rpc.mountd"
-            kill `cat $MOUNTPID`
+                kill `cat $MOUNTPID`
-            rm -f $MOUNTPID
+                rm -f $MOUNTPID
        else
-            echo "No PID file, not stopping rpc.mountd"
+                echo "No PID file, not stopping rpc.mountd"
        fi
        if [ -f "$NFSPID" ]; then
-            echo "Stopping rpc.nfsd"
+                echo "Stopping rpc.nfsd"
-            kill `cat $NFSPID`
+                kill `cat $NFSPID`
-            rm -f $NFSPID
+                rm -f $NFSPID
        else
-            echo "No PID file, not stopping rpc.nfsd"
+                echo "No PID file, not stopping rpc.nfsd"
        fi
        if [ -f "$EXPORTS" ]; then
-        echo "Removing exports file"
+                echo "Removing exports file"
-        rm -f $EXPORTS
+                rm -f $EXPORTS
        fi
        ;;
  restart)
        $0 stop $NFS_EXPORT_DIR
        $0 start $NFS_EXPORT_DIR 
        if [ ! $? = 0 ]; then
-            exit 1
+                exit 1
        fi
        ;;
  *)

diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs index 3c77dd74cd..ca79af340d 100755 --- a/scripts/runqemu-export-rootfs +++ b/scripts/runqemu-export-rootfs
@@ -40,9 +40,9 @@ NFS_EXPORT_DIR=$(cd "$2" && pwd)
40		40
41	SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot 2> /dev/null`	41	SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot 2> /dev/null`
42	if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then	42	if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
43	echo "Error: Unable to find the oe-find-native-sysroot script"	43	echo "Error: Unable to find the oe-find-native-sysroot script"
44	echo "Did you forget to source your build environment setup script?"	44	echo "Did you forget to source your build environment setup script?"
45	exit 1	45	exit 1
46	fi	46	fi
47	. $SYSROOT_SETUP_SCRIPT	47	. $SYSROOT_SETUP_SCRIPT
48		48
@@ -50,9 +50,9 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
50	echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"	50	echo "Error: Unable to find rpc.mountd 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'?"
54	else	54	else
55	echo "This shouldn't happen - something is missing from your toolchain installation"	55	echo "This shouldn't happen - something is missing from your toolchain installation"
56	fi	56	fi
57	exit 1	57	exit 1
58	fi	58	fi
@@ -104,53 +104,53 @@ case "$1" in
104	echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"	104	echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"
105	$PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS	105	$PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS
106	if [ ! $? = 0 ]; then	106	if [ ! $? = 0 ]; then
107	echo "====================="	107	echo "====================="
108	echo "Error starting MOUNTD"	108	echo "Error starting MOUNTD"
109	echo "====================="	109	echo "====================="
110	ps -ef \| grep -v grep \| grep rpcbind 2>&1 > /dev/null	110	ps -ef \| grep -v grep \| grep rpcbind 2>&1 > /dev/null
111	if [ $? = 0 ] ; then	111	if [ $? = 0 ] ; then
112	echo " If you see an error above that says:"	112	echo " If you see an error above that says:"
113	echo " RPC: Authentication error; why = Client credential too weak"	113	echo " RPC: Authentication error; why = Client credential too weak"
114	echo " You need to change the startup of rpcbind"	114	echo " You need to change the startup of rpcbind"
115	echo " on your host by doing the following as root:"	115	echo " on your host by doing the following as root:"
116	echo "==============================================="	116	echo "==============================================="
117	echo " According to /etc/sysconfig/rpcbind, then "	117	echo " According to /etc/sysconfig/rpcbind, then "
118	echo " echo RPCBIND_ARGS=-i >> /etc/sysconfig/rpcbind"	118	echo " echo RPCBIND_ARGS=-i >> /etc/sysconfig/rpcbind"
119	echo " or"	119	echo " or"
120	echo " echo RPCBIND_OPTIONS=-i >> /etc/sysconfig/rpcbind"	120	echo " echo RPCBIND_OPTIONS=-i >> /etc/sysconfig/rpcbind"
121	echo " /etc/init.d/rpcbind restart"	121	echo " /etc/init.d/rpcbind restart"
122	echo "==============================================="	122	echo "==============================================="
123	echo "For Ubuntu 11.10 hosts"	123	echo "For Ubuntu 11.10 hosts"
124	echo "Add OPTIONS=\"-i -w\" to /etc/default/rpcbind"	124	echo "Add OPTIONS=\"-i -w\" to /etc/default/rpcbind"
125	echo "sudo service portmap restart"	125	echo "sudo service portmap restart"
126	fi	126	fi
127	exit 1	127	exit 1
128	fi	128	fi
129	echo "Starting User Mode nfsd"	129	echo "Starting User Mode nfsd"
130	echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"	130	echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"
131	$PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS	131	$PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS
132	if [ ! $? = 0 ]; then	132	if [ ! $? = 0 ]; then
133	echo "Error starting nfsd"	133	echo "Error starting nfsd"
134	exit 1	134	exit 1
135	fi	135	fi
136	# Check to make sure everything started ok.	136	# Check to make sure everything started ok.
137	if [ ! -f $MOUNTPID ]; then	137	if [ ! -f $MOUNTPID ]; then
138	echo "rpc.mountd did not start correctly"	138	echo "rpc.mountd did not start correctly"
139	exit 1	139	exit 1
140	fi	140	fi
141	if [ ! -f $NFSPID ]; then	141	if [ ! -f $NFSPID ]; then
142	echo "rpc.nfsd did not start correctly"	142	echo "rpc.nfsd did not start correctly"
143	exit 1	143	exit 1
144	fi	144	fi
145	ps -fp `cat $MOUNTPID` > /dev/null 2> /dev/null	145	ps -fp `cat $MOUNTPID` > /dev/null 2> /dev/null
146	if [ ! $? = 0 ]; then	146	if [ ! $? = 0 ]; then
147	echo "rpc.mountd did not start correctly"	147	echo "rpc.mountd did not start correctly"
148	exit 1	148	exit 1
149	fi	149	fi
150	ps -fp `cat $NFSPID` > /dev/null 2> /dev/null	150	ps -fp `cat $NFSPID` > /dev/null 2> /dev/null
151	if [ ! $? = 0 ]; then	151	if [ ! $? = 0 ]; then
152	echo "rpc.nfsd did not start correctly"	152	echo "rpc.nfsd did not start correctly"
153	exit 1	153	exit 1
154	fi	154	fi
155	echo " "	155	echo " "
156	echo "On your target please remember to add the following options for NFS"	156	echo "On your target please remember to add the following options for NFS"
@@ -158,29 +158,29 @@ case "$1" in
158	;;	158	;;
159	stop)	159	stop)
160	if [ -f "$MOUNTPID" ]; then	160	if [ -f "$MOUNTPID" ]; then
161	echo "Stopping rpc.mountd"	161	echo "Stopping rpc.mountd"
162	kill `cat $MOUNTPID`	162	kill `cat $MOUNTPID`
163	rm -f $MOUNTPID	163	rm -f $MOUNTPID
164	else	164	else
165	echo "No PID file, not stopping rpc.mountd"	165	echo "No PID file, not stopping rpc.mountd"
166	fi	166	fi
167	if [ -f "$NFSPID" ]; then	167	if [ -f "$NFSPID" ]; then
168	echo "Stopping rpc.nfsd"	168	echo "Stopping rpc.nfsd"
169	kill `cat $NFSPID`	169	kill `cat $NFSPID`
170	rm -f $NFSPID	170	rm -f $NFSPID
171	else	171	else
172	echo "No PID file, not stopping rpc.nfsd"	172	echo "No PID file, not stopping rpc.nfsd"
173	fi	173	fi
174	if [ -f "$EXPORTS" ]; then	174	if [ -f "$EXPORTS" ]; then
175	echo "Removing exports file"	175	echo "Removing exports file"
176	rm -f $EXPORTS	176	rm -f $EXPORTS
177	fi	177	fi
178	;;	178	;;
179	restart)	179	restart)
180	$0 stop $NFS_EXPORT_DIR	180	$0 stop $NFS_EXPORT_DIR
181	$0 start $NFS_EXPORT_DIR	181	$0 start $NFS_EXPORT_DIR
182	if [ ! $? = 0 ]; then	182	if [ ! $? = 0 ]; then
183	exit 1	183	exit 1
184	fi	184	fi
185	;;	185	;;
186	*)	186	*)