summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/sysvinit
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-07-22 15:23:35 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:47:17 +0100
commit5c22973e1bf76615bcf57984ac7a30cf7d0766df (patch)
treef8162dc1e4fc7a9d5dea6f11a2caff2f35438a78 /meta/recipes-core/sysvinit
parent42f107513148aa6e9fd69d51e63a183c613114c0 (diff)
downloadopenembedded-core-contrib-5c22973e1bf76615bcf57984ac7a30cf7d0766df.tar.gz
openembedded-core-contrib-5c22973e1bf76615bcf57984ac7a30cf7d0766df.tar.bz2
openembedded-core-contrib-5c22973e1bf76615bcf57984ac7a30cf7d0766df.zip
sysvinit: bootlogd: Don't run savelog if it's not installed
bootlogd's default log rotation code on stop requires `savelog`, which is in debianutils, which may not be installed. If it's not installed, don't try to perform the log rotation. That is: in the affected code block, `savelog` is what is responsible for creating "boot.0". When `savelog` doesn't exist, an error message gets printed on bootup to the effect of "mv: can't find boot.0". Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ben Shelton <ben.shelton@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit')
-rwxr-xr-xmeta/recipes-core/sysvinit/sysvinit/bootlogd.init4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
index 06af465a5b..df5aa430cf 100755
--- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
+++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
@@ -63,8 +63,8 @@ case "$ACTION" in
[ "${VERBOSE}" != "no" ] && echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --exec $DAEMON
- if [ "$STOPPER" ] && [ -f /var/log/boot ] && \
- [ -f /var/log/boot~ ]
+ if [ "$STOPPER" ] && [ "$(which savelog 2>/dev/null)" ] && \
+ [ -f /var/log/boot ] && [ -f /var/log/boot~ ]
then
cd /var/log
chgrp adm boot