summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-03-13 19:41:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:44 +0000
commitd0d404f7cdd941b878bb11f7d67d0f747441d0da (patch)
treeae23a6dfb12b50945f79cf5bf603322f132d90c6 /meta
parent7197dab59c5981d664a0ac84d07022cc96236190 (diff)
downloadpoky-d0d404f7cdd941b878bb11f7d67d0f747441d0da.tar.gz
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. (From OE-Core rev: 0332e19098d7d3d623a04098b43e3b2482af1a17) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-core/systemd/systemd-systemctl/systemctl2
1 files changed, 1 insertions, 1 deletions
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
149 disable_service="$ROOT/etc/systemd/system/$r.wants/$service" 149 disable_service="$ROOT/etc/systemd/system/$r.wants/$service"
150 fi 150 fi
151 rm -f $disable_service 151 rm -f $disable_service
152 rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants 152 [ -d $ROOT/etc/systemd/system/$r.wants ] && rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants
153 echo "Disabled ${disable_service##$ROOT/etc/systemd/system/$r.wants/} for $wanted_by." 153 echo "Disabled ${disable_service##$ROOT/etc/systemd/system/$r.wants/} for $wanted_by."
154 fi 154 fi
155 done 155 done