[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2017/8267] initscripts: Check for logrotate in dmesg.sh



commit 0d445840c4a93392b72f4cc031bf5cff4b5da046
Author: Ovidiu Vancea <ovidiu vancea ni com>
Date:   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
    
    (From OE-Core rev: 277a5975d43125623b5a51ddcb48f9ee2474d0fc)
    
    Signed-off-by: Ovidiu Vancea <ovidiu vancea ni com>
    Signed-off-by: Ioan-Adrian Ratiu <adrian ratiu ni com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initscripts/initscripts-1.0/dmesg.sh           |    4 ++--
 1 files 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]