2008-10-10 Tambet Ingo <tambet@gmail.com>

	* src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as
	a daemon to prevent NM logging spew on console on startup and shutdown (due
	to dependency loop between NM and syslog).

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4166 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index 4a62286..5c580b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10  Tambet Ingo  <tambet@gmail.com>
+
+       * src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as
+       a daemon to prevent NM logging spew on console on startup and shutdown (due
+       to dependency loop between NM and syslog).
+
 2008-10-10  Alexander Sack  <asac@ubuntu.com>
 
        Implement managed mode. We bind devices configured in /etc/network/interfaces

diff --git a/src/nm-logging.c b/src/nm-logging.c
index 82a933f..cd098f6 100644 (file)
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -147,7 +147,7 @@ void
 nm_logging_setup (gboolean become_daemon)
 {
        if (become_daemon)
-               openlog (G_LOG_DOMAIN, LOG_CONS, LOG_DAEMON);
+               openlog (G_LOG_DOMAIN, 0, LOG_DAEMON);
        else
                openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PERROR, LOG_USER);