Author: freetz Date: Sat Apr 1 13:57:41 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
hald.sysconfig (1.2 -> 1.3) , haldaemon.init (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/hald.sysconfig
diff -u SOURCES/hald.sysconfig:1.2 SOURCES/hald.sysconfig:1.3
--- SOURCES/hald.sysconfig:1.2 Wed May 18 11:51:53 2005
+++ SOURCES/hald.sysconfig Sat Apr 1 15:57:36 2006
@@ -1,6 +1,7 @@
# Customized settings for hal daemon
-
-verbose="no"
+#
+# Logging output
+USE_SYSLOG="yes"
# This must be last line !
# vi:syntax=sh:tw=78:ts=8:sw=4
================================================================
Index: SOURCES/haldaemon.init
diff -u SOURCES/haldaemon.init:1.5 SOURCES/haldaemon.init:1.6
--- SOURCES/haldaemon.init:1.5 Thu Dec 8 02:02:49 2005
+++ SOURCES/haldaemon.init Sat Apr 1 15:57:36 2006
@@ -24,11 +24,11 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/haldaemon ]; then
msg_starting haldaemon
- # Verbose mode on/off
- if is_yes "$verbose"; then
- daemon hald --verbose=yes --retain-privileges
+ # Syslog output
+ if is_yes "$USE_SYSLOG"; then
+ daemon hald --use-syslog
else
- daemon hald --verbose=no --retain-privileges
+ daemon hald
fi
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/haldaemon
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/hald.sysconfig?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/haldaemon.init?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
