diff options
| author |   Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2012-11-16 16:21:33 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-18 10:49:43 +0100 |
| commit | 38a5cf3fa06972992f473027658d5b0cffff3a33 (patch) | |
| tree | 40398531b20d7abfbcb6c4167b92c2c667789aee /meta-systemd | |
| parent | 5d7953c03fbbe8066f60cc8f788511870ad232cc (diff) | |
| download | meta-openembedded-38a5cf3fa06972992f473027658d5b0cffff3a33.tar.gz | |
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 <enrico.scholz@sigma-chemnitz.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 8 |
1 files changed, 0 insertions, 8 deletions
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 |