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 8fc7f0304b9b0f2e57664986ae1fea1e39493da6..7ce6dbc4a87a00bc3d98102dcc20154c088f0217 100755 (executable)
--- 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 e7581d4869f924fb0cbe8457c35da6f323593edb..a71d0fe51c982eb9f060ecc4988c4163e3392344 100644 (file)
--- 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