gadget-init: minor logic cleanups

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

3 files changed, 11 insertions, 7 deletions

diff --git a/recipes-ti/beagleboard/gadget-init.bb b/recipes-ti/beagleboard/gadget-init.bb
index 247d2e10..8ddefaa2 100644
--- a/recipes-ti/beagleboard/gadget-init.bb
+++ b/recipes-ti/beagleboard/gadget-init.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Units to initialize usb gadgets"
 
-PR = "r9"
+PR = "r10"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
@@ -24,7 +24,7 @@ do_install() {
         install -d ${D}${base_libdir}/systemd/system/basic.target.wants
         install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system
 
-        for i in ${WORKDIR}/*.service ; do
+        for i in ${WORKDIR}/storage-gadget-init.service ; do
                 install -m 0644 $i ${D}${base_libdir}/systemd/system
                 ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/
         done
@@ -48,7 +48,7 @@ FILES_${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service
                        ${sysconfdir}/udev/rules.d/bone-gmass-eject.rules"
 
 FILES_${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \
-                       ${base_libdir}systemd/system/basic.target.wants/network-gadget-init.service \
+                       ${base_libdir}/systemd/system/basic.target.wants/network-gadget-init.service \
                        ${bindir}/g-ether-load.sh \
                        ${bindir}/g-ether-start-service.sh"
 
diff --git a/recipes-ti/beagleboard/gadget-init/network-gadget-init.service b/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
index 979d8aa4..1e226272 100644
--- a/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
+++ b/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
@@ -4,6 +4,9 @@ Conflicts=storage-gadget-init.service
 
 [Service]
 RemainAfterExit=yes
-ExecStart=/usr/bin/g-ether-load.sh
-ExecStartPost=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252
+ExecStartPre=/usr/bin/g-ether-load.sh
+ExecStart=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252
 ExecStop=/sbin/rmmod g_ether
+
+[Install]
+WantedBy=gether.target
diff --git a/recipes-ti/beagleboard/gadget-init/udhcpd.service b/recipes-ti/beagleboard/gadget-init/udhcpd.service
index f0766733..1f4ac688 100644
--- a/recipes-ti/beagleboard/gadget-init/udhcpd.service
+++ b/recipes-ti/beagleboard/gadget-init/udhcpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=DHCP server for USB0 network gadget
-After=sys-devices-platform-omap-ti81xx\x2dusbss-musb\x2dhdrc.0-gadget-net-usb0.device
+After=dev-usb0.device
+Conflicts=storage-gadget-init.service
 
 [Service]
 ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf
@@ -8,4 +9,4 @@ ExecStop=/bin/kill -TERM $MAINPID
 KillSignal=SIGINT
 
 [Install]
-WantedBy=basic.target
+WantedBy=gether.target