[oe-commits] [openembedded-core] 04/32: initscripts: Check for logrotate in dmesg.sh

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e0e04922fede1a71ad0535d4a38dd28f1d133f1a
Author: Ovidiu Vancea <ovidiu.vancea at ni.com>
AuthorDate: Fri Aug 12 18:04:12 2016 +0300

    initscripts: Check for logrotate in dmesg.sh
    
    Autodetect previously hardcoded logrotate location because it can be
    installed in multiple places like /usr/bin/logrotate which is very
    common besides /usr/sbin
    
    Signed-off-by: Ovidiu Vancea <ovidiu.vancea at ni.com>
    Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh b/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
old mode 100644
new mode 100755
index a97b068..2b9eba6
--- a/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
@@ -8,8 +8,8 @@
 ### END INIT INFO
 
 if [ -f /var/log/dmesg ]; then
-	if [ -f /usr/sbin/logrotate ]; then
-		logrotate -f /etc/logrotate-dmesg.conf
+	if LOGPATH=$(which logrotate); then
+		$LOGPATH -f /etc/logrotate-dmesg.conf
 	else
 		mv -f /var/log/dmesg /var/log/dmesg.old
 	fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.