[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7176/8267] opkg-configure: do not reload daemon configuration

[Emmanuele Bassi <ebassi src gnome org>]

commit fd266b1b66844d660ebd8e33fe22c08c8ddaccbf
Author: Max Krummenacher <max oss 09 gmail com>
Date:   Sat Aug 12 19:20:58 2017 +0200

    opkg-configure: do not reload daemon configuration
    
    In case a systemd service disables itself while init is still in its
    boot sequence the reloading of the service files can be problematic.
    In that case: It seems that systemd looses the state of .device units,
    and some services depend on such units (namely serial consoles such as
    serial-getty@ttymxc0.service). As a result no getty is spawned on the
    affected serial tty.
    After a power-cycle the second boot (which does not disable services)
    succeeds.
    
    The following sequence shows this problem:
    
    | Jan 09 16:36:28 apalis-t30 systemctl[162]: Removed 
/etc/systemd/system/sysinit.target.wants/run-postinsts.service.
    | Jan 09 16:36:28 apalis-t30 systemd[1]: Reloading.
    |    ...
    |    And then the failing one:
    | Feb 22 15:33:15 apalis-t30 systemd[1]: dev-ttyS0.device: Job dev-ttyS0.device/start timed out.
    | Feb 22 15:33:15 apalis-t30 systemd[1]: Timed out waiting for device dev-ttyS0.device.
    | Feb 22 15:33:15 apalis-t30 systemd[1]: Dependency failed for Serial Getty on ttyS0.
    | Feb 22 15:33:15 apalis-t30 systemd[1]: serial-getty@ttyS0.service: Job serial-getty@ttyS0.service/start 
failed with result 'dependency'.
    | Feb 22 15:33:15 apalis-t30 systemd[1]: dev-ttyS0.device: Job dev-ttyS0.device/start failed with result 
'timeout'.
    | Feb 22 15:33:15 apalis-t30 systemd[1]: Reached target Login Prompts.
    
    (the time has been updated between this two events, but that does not
    influence the issue)
    
    Using --no-reload in the service file avoids the "Reloading." message
    above and seems to not cause such issues anymore.
    
    Reported-by: Stefan Agner <stefan agner toradex com>
    (From OE-Core rev: 059bc9b164d239f0ba319f8e6a54b5edf7761b22)
    
    Signed-off-by: Max Krummenacher <max krummenacher toradex com>
    (cherry picked from commit 16b7b455ee40fd1be5bb9aacf24b106df0d9325e)
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../opkg/opkg/opkg-configure.service               |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service 
b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
index 8e74026..432c3dd 100644
--- a/meta/recipes-devtools/opkg/opkg/opkg-configure.service
+++ b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
@@ -8,7 +8,7 @@ Before=sysinit.target
 Type=oneshot
 EnvironmentFile=-@SYSCONFDIR@/default/postinst
 ExecStart=-@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then @BINDIR@/opkg configure > $LOGFILE 
2>&1; else @BINDIR@/opkg configure; fi"
-ExecStartPost=@BASE_BINDIR@/systemctl disable opkg-configure.service
+ExecStartPost=@BASE_BINDIR@/systemctl --no-reload disable opkg-configure.service
 StandardOutput=syslog
 RemainAfterExit=No