[oe-commits] [openembedded-core] 06/15: systat: systemd never enables the service

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 24ccfd80edb74871d0d69ddbe83c358f04ac0844
Author: Stefano Babic <sbabic at denx.de>
AuthorDate: Tue Jun 18 12:06:17 2019 +0200

    systat: systemd never enables the service
    
    Even if SYSTEMD_AUTO_ENABLE is set to "enable", the service is never
    activated by systemd. The cause is the postinst function in the recipe:
    
     pkg_postinst_${PN} () {
             if [ -n "$D" ]; then
                     exit 0
             fi
             if [ -e /etc/init.d/populate-volatile.sh ]; then
                     /etc/init.d/populate-volatile.sh update
             fi
     }
    
    This generates with activated systemd the following postinst script:
    
    	set -e
    	        if [ -n "$D" ]; then
    	                exit 0
    	        fi
    	        if [ -e /etc/init.d/populate-volatile.sh ]; then
    	                /etc/init.d/populate-volatile.sh update
    	        fi
    	OPTS=""
    
    	if [ -n "$D" ]; then
    	    OPTS="--root=$D"
    	fi
    
    	if type systemctl >/dev/null 2>/dev/null; then
    		if [ -z "$D" ]; then
    			systemctl daemon-reload
    		fi
    
    		systemctl $OPTS enable sysstat.service
    
    		if [ -z "$D" -a "enable" = "enable" ]; then
    			systemctl --no-block restart sysstat.service
    		fi
    	fi
    
    Due to the exit statement, systemctl is never called and the service is
    never enabled in rootfs.
    Invert the logic for the check to let run the rest of postinst script.
    
    Signed-off-by: Stefano Babic <sbabic at denx.de>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/sysstat/sysstat.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 6b21c6b..4e29721 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -52,12 +52,11 @@ do_install() {
 }
 
 pkg_postinst_${PN} () {
-        if [ -n "$D" ]; then
-                exit 0
-        fi
-        if [ -e /etc/init.d/populate-volatile.sh ]; then
-                /etc/init.d/populate-volatile.sh update
-        fi
+	if [  ! -n "$D" ]; then
+		if [ -e /etc/init.d/populate-volatile.sh ]; then
+			/etc/init.d/populate-volatile.sh update
+		fi
+	fi
 }
 
 FILES_${PN} += "${libdir}/sa ${systemd_system_unitdir}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.