From: Martin Jansa Date: Fri, 13 Mar 2015 18:41:40 +0000 (+0100) Subject: systemctl: Don't try to remove directory which doesn't exist X-Git-Tag: 2015-4~161 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0332e19098d7d3d623a04098b43e3b2482af1a17;p=openembedded-core.git systemctl: Don't try to remove directory which doesn't exist Noticed in this log.do_rootfs error: Started /OE/build/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/systemctl --root=/OE/build/shr-core/tmp-glibc/work/nokia900-oe-linux-gnueabi/shr-image/2.0-r20/rootfs disable bluetooth.service Try to find location of bluetooth.service... Found bluetooth.service in /lib/systemd/system/bluetooth.service WantedBy=bluetooth.target found in bluetooth.service rmdir: failed to remove '/OE/build/shr-core/tmp-glibc/work/nokia900-oe-linux-gnueabi/shr-image/2.0-r20/rootfs/etc/systemd/system/bluetooth.target.wants': No such file or directory Disabled bluetooth.service for bluetooth.target. Disabled bluetooth.service for dbus-org.bluez.service. Signed-off-by: Martin Jansa Signed-off-by: Ross Burton --- diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 2e632b00bc..6e163bd5c2 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -149,7 +149,7 @@ for service in $services; do disable_service="$ROOT/etc/systemd/system/$r.wants/$service" fi rm -f $disable_service - rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants + [ -d $ROOT/etc/systemd/system/$r.wants ] && rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants echo "Disabled ${disable_service##$ROOT/etc/systemd/system/$r.wants/} for $wanted_by." fi done