[PATCH 1/2] init: make explicit to run sanlock as root

[Federico Simoncelli]

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 
---
 init.d/sanlock |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

[PATCH 2/2] wdmd: load the softdog module when needed

[Federico Simoncelli]

Signed-off-by: Federico Simoncelli 
---
 init.d/wdmd |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

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=$?