diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-10-06 12:24:16 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-10-06 12:24:16 -0700 |
| commit | d11f23ed4ca2f02b309785e52de11199b3f130e2 (patch) | |
| tree | 72af1b83a21c1c54d8802ea75b05e77c26842427 | |
| parent | d15a5ee594f46a855788652e687aa5d736d530fb (diff) | |
| parent | 668aedc070d767d3aa33413e3f918a1e953e0f98 (diff) | |
| download | openvswitch-d11f23ed4ca2f02b309785e52de11199b3f130e2.tar.gz | |
Merge remote branch 'origin/master' into HEAD
| -rw-r--r-- | datapath/linux-2.6/Kbuild.in | 3 | ||||
| -rwxr-xr-x | xenserver/usr_share_openvswitch_scripts_ovs-external-ids | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/datapath/linux-2.6/Kbuild.in b/datapath/linux-2.6/Kbuild.in index f08eb9c5e..2158382b0 100644 --- a/datapath/linux-2.6/Kbuild.in +++ b/datapath/linux-2.6/Kbuild.in @@ -11,7 +11,6 @@ include $(srcdir)/Modules.mk EXTRA_CFLAGS := -DVERSION=\"$(VERSION)\" EXTRA_CFLAGS += -I$(srcdir)/.. EXTRA_CFLAGS += -I$(builddir)/.. -EXTRA_CFLAGS += -I$(top_srcdir)/include ifeq '$(BUILDNR)' '0' EXTRA_CFLAGS += -DBUILDNR=\"\" else @@ -23,7 +22,7 @@ EXTRA_CFLAGS += -include $(builddir)/kcompat.h # These include directories have to go before -I$(KSRC)/include. # NOSTDINC_FLAGS just happens to be a variable that goes in the # right place, even though it's conceptually incorrect. -NOSTDINC_FLAGS += -I$(srcdir)/compat-2.6 -I$(srcdir)/compat-2.6/include +NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat-2.6 -I$(srcdir)/compat-2.6/include obj-m := $(patsubst %,%_mod.o,$(build_modules)) diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-external-ids b/xenserver/usr_share_openvswitch_scripts_ovs-external-ids index fc27aaae1..13c644f0b 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-external-ids +++ b/xenserver/usr_share_openvswitch_scripts_ovs-external-ids @@ -37,12 +37,12 @@ import ovs.daemon import ovs.db.idl s_log = logging.getLogger("ovs-external-ids") -l_handler = logging.handlers.SysLogHandler( - "/dev/log", - facility=logging.handlers.SysLogHandler.LOG_DAEMON) +l_handler = logging.handlers.RotatingFileHandler( + "/var/log/openvswitch/ovs-external-ids.log") l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s') l_handler.setFormatter(l_formatter) s_log.addHandler(l_handler) +s_log.setLevel(logging.INFO) vsctl="/usr/bin/ovs-vsctl" session = None |