[oe-commits] [meta-openembedded] 21/69: edac-utils: fix systemd service

[git at git.openembedded.org]

martin_jansa pushed a commit to branch morty-next
in repository meta-openembedded.

commit ebc3e16c7d698b16c2edfef64eef0c14a6a6a758
Author: Qi.Chen at windriver.com <Qi.Chen at windriver.com>
AuthorDate: Fri Nov 4 16:36:58 2016 +0800

    edac-utils: fix systemd service
    
    Fix edac-utils systemd service file so that `systemctl stop edac' doesn't
    fail.
    
    Remove the ExecStop line as there's no '--unload' option for edac-ctl.
    Also, disable edac service by default.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit caf48f2ea58f63b1a91a3d2aeafe98745efe0a50)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/edac-utils/edac-utils_git.bb  | 1 +
 meta-oe/recipes-support/edac-utils/files/edac.service | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index b3ff1cc..2c0914d 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -44,3 +44,4 @@ do_install_append() {
 }
 
 SYSTEMD_SERVICE_${PN} = "edac.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service b/meta-oe/recipes-support/edac-utils/files/edac.service
index 9f687a8..f6b211e 100644
--- a/meta-oe/recipes-support/edac-utils/files/edac.service
+++ b/meta-oe/recipes-support/edac-utils/files/edac.service
@@ -4,7 +4,6 @@ Description=Initialize EDAC Drivers For Machine Hardware
 [Service]
 Type=oneshot
 ExecStart=@SBINDIR@/edac-ctl --register-labels
-ExecStop=@SBINDIR@/edac-ctl --unload
 RemainAfterExit=yes
 
 [Install]

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