[PATCH 4/6] xserver: log locally

Tiago Vignatti tiago.vignatti at intel.com
Mon Apr 16 07:31:43 PDT 2012


useful for weston on non-suid environments.

Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
 src/Makefile.am        |    2 +-
 src/xserver-launcher.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f0150e8..4be869b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ endif
 if ENABLE_XSERVER_LAUNCHER
 xserver_launcher = xserver-launcher.la
 xserver_launcher_la_LDFLAGS = -module -avoid-version
-xserver_launcher_la_LIBADD = $(XSERVER_LAUNCHER_LIBS)
+xserver_launcher_la_LIBADD = $(XSERVER_LAUNCHER_LIBS) ../shared/libconfig-parser.la
 xserver_launcher_la_CFLAGS = $(GCC_CFLAGS)
 xserver_launcher_la_SOURCES =			\
 	xserver-launcher.c			\
diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
index c5ca326..639a188 100644
--- a/src/xserver-launcher.c
+++ b/src/xserver-launcher.c
@@ -1402,6 +1402,7 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
 		if (execl(XSERVER_PATH,
 			  XSERVER_PATH,
 			  display,
+			  "-logfile", config_file_path("Xorg.log"),
 			  "-wayland",
 			  "-rootless",
 			  "-retro",
-- 
1.7.5.4



More information about the wayland-devel mailing list