From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 8 Aug 2014 15:50:03 +0000 (+0200)
Subject: Services move to /service fixes
X-Git-Tag: v3.3.0~75
X-Git-Url: http://zhaoyanbai.com/repos/doxygen-warnings.log?a=commitdiff_plain;h=8edaaa301ccebf7dcc292e94360503940b26171c;p=minix.git

Services move to /service fixes

 - Fix init rights not adjusted at boot time

 - Fix usbd not loaded on BBB / BBW

Change-Id: Ic690547876d486165e74c749a4fe43891d0e1e8d
---

diff --git a/etc/rc b/etc/rc
index 8fc7f0304..7ce6dbc4a 100755
--- a/etc/rc
+++ b/etc/rc
@@ -59,6 +59,11 @@ edit()
     if [ ! -x $binlocation ]
     then	binlocation=/usr/pkg/service/$service
     fi
+
+    # Mostly to find init...
+    if [ ! -x $binlocation ]
+    then	binlocation=/sbin/$service
+    fi
     service $opt edit $binlocation -label $service "$@" 
 }
 
diff --git a/etc/usr/rc b/etc/usr/rc
index e7581d486..a71d0fe51 100644
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -282,7 +282,7 @@ start|autoboot)
 				# fb hasn't been ported to AM335X yet.
 			fi
 
-			if [ -e /usr/sbin/usbd ]
+			if [ -e /service/usbd ]
 			then
 				echo "Starting USBD"
 				up usbd
@@ -315,7 +315,7 @@ start|autoboot)
 			#up fb -dev /dev/fb0 -args edid.0=tda19988.1.3470
 			# fb hasn't been ported to AM335X yet.
 
-			if [ -e /usr/sbin/usbd ]
+			if [ -e /service/usbd ]
 			then
 				echo "Starting USBD"
 				up usbd