From patchwork Wed May 16 16:55:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: avahi-systemd: drop postrm, use prerm instead Date: Wed, 16 May 2012 16:55:31 -0000 From: Andreas Oberritter X-Patchwork-Id: 27835 Message-Id: <1337187331-4945-1-git-send-email-obi@opendreambox.org> To: openembedded-core@lists.openembedded.org * Calling "systemctl disable" from postrm is too late and causes the following error: | Failed to issue method call: No such file or directory * Fix indentation of prerm for resulting shell snippet. * Messing with $D is not needed in *rm scripts. Signed-off-by: Andreas Oberritter --- meta/recipes-connectivity/avahi/avahi.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 61ca25f..f84a81d 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,7 +14,7 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r2" +INC_PR = "r3" DEPENDS = "expat libcap libdaemon dbus glib-2.0" @@ -163,12 +163,7 @@ pkg_postinst_avahi-systemd() { systemctl enable avahi-daemon.service } -pkg_postrm_avahi-systemd() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - systemctl disable avahi-daemon.service +pkg_prerm_avahi-systemd() { +systemctl disable avahi-daemon.service }