[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1279298644 -3600
# Node ID 4514d5890692989aa78c54a1a283d1b3bcc6fe46
# Parent  07b718833c7416b06a3aee61a0bf27c2e1df1160
# Parent  91ce0b0953ca684cc11beceda6adcf5cdef7b1b3
Merge
---
 tools/console/daemon/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 07b718833c74 -r 4514d5890692 tools/console/daemon/main.c
--- a/tools/console/daemon/main.c       Fri Jul 16 17:41:53 2010 +0100
+++ b/tools/console/daemon/main.c       Fri Jul 16 17:44:04 2010 +0100
@@ -73,7 +73,8 @@ int main(int argc, char **argv)
        bool is_interactive = false;
        int ch;
        int syslog_option = LOG_CONS;
-       int syslog_mask = LOG_WARNING;
+       int syslog_mask = 
LOG_MASK(LOG_WARNING)|LOG_MASK(LOG_ERR)|LOG_MASK(LOG_CRIT)|\
+                         LOG_MASK(LOG_ALERT)|LOG_MASK(LOG_EMERG);
        int opt_ind = 0;
        char *pidfile = NULL;
 
@@ -89,7 +90,8 @@ int main(int argc, char **argv)
 #ifndef __sun__
                        syslog_option |= LOG_PERROR;
 #endif
-                       syslog_mask = LOG_DEBUG;
+                       syslog_mask |= LOG_MASK(LOG_NOTICE)|LOG_MASK(LOG_INFO)| 
\
+                                     LOG_MASK(LOG_DEBUG);
                        break;
                case 'i':
                        is_interactive = true;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog