From 38a5cf3fa06972992f473027658d5b0cffff3a33 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 16 Nov 2012 16:21:33 +0000 Subject: systemd.bbclass: move disable operation into prerm() script The 'systemctl disable' operation should not be done in postrm() because the .service file does not exist anymore and the script will fail hence. After moving this command into prerm(), postrm() becomes empty and can be removed completely. Signed-off-by: Enrico Scholz Acked-by: Otavio Salvador Signed-off-by: Martin Jansa --- meta-systemd/classes/systemd.bbclass | 8 -------- 1 file changed, 8 deletions(-) (limited to 'meta-systemd/classes') diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index 16ac1fbf1e..f2a0363361 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass @@ -22,9 +22,7 @@ systemd_prerm() { if [ -z "$D" ]; then systemctl stop ${SYSTEMD_SERVICE} fi -} -systemd_postrm() { systemctl disable ${SYSTEMD_SERVICE} } @@ -120,12 +118,6 @@ python populate_packages_prepend () { prerm += localdata.getVar('systemd_prerm', 1) d.setVar('pkg_prerm_%s' % pkg, prerm) - postrm = localdata.getVar('pkg_postrm', 1) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += localdata.getVar('systemd_postrm', 1) - d.setVar('pkg_postrm_%s' % pkg, postrm) - # add files to FILES_*-systemd if existent and not already done def systemd_append_file(pkg_systemd, file_append): appended = False -- cgit 1.2.3-korg