mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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>
This commit is contained in:
committed by
Martin Jansa
parent
5d7953c03f
commit
38a5cf3fa0
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user