2 commits - init.d/sanlock init.d/wdmd

[David Teigland]

init.d/sanlock |    2 +-
 init.d/wdmd    |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b6dc3c761c75a0411a607544a1b76955dbe9a1a7
Author: Federico Simoncelli 
Date:   Thu Jun 14 09:41:12 2012 +0000

wdmd: load the softdog module when needed

Signed-off-by: Federico Simoncelli

diff --git a/init.d/wdmd b/init.d/wdmd
index 9ec7b8c..19fc3ae 100644
--- a/init.d/wdmd
+++ b/init.d/wdmd
@@ -39,6 +39,13 @@ start() {
    	[ -x /sbin/restorecon ] && restorecon /var/run/$prog
    fi

+	if [ ! -c /dev/watchdog ]; then
+		echo -n $"Loading the softdog kernel module: "
+		modprobe softdog && udevadm settle
+		[ -c /dev/watchdog ] && success || failure
+		echo
+	fi
+
    echo -n $"Starting $prog: "
    daemon $prog $WDMDOPTS
    retval=$?

commit 6cead337ff6c065a983e9d4e539fb28f3b812498
Author: Federico Simoncelli 
Date:   Thu Jun 14 09:41:11 2012 +0000

init: make explicit to run sanlock as root

Adding the explicit user (root) used to run sanlock makes runuser
    acquire the supplementary groups for the process also at boot time.

Signed-off-by: Federico Simoncelli

diff --git a/init.d/sanlock b/init.d/sanlock
index 636d581..7521ae5 100644
--- a/init.d/sanlock
+++ b/init.d/sanlock
@@ -40,7 +40,7 @@ start() {
    fi

echo -n $"Starting $prog: "
-	daemon $prog daemon $SANLOCKOPTS
+	daemon --user root $prog daemon $SANLOCKOPTS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile