xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Init.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit ae68708ebe24c4cdf8c5265e206f6913d9298f37
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 20 15:45:57 2009 -0400

    xfree86: dump /proc/cmdline in the log on Linux

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 44eed4d..30f085e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -188,6 +188,21 @@ xf86PrintBanner(void)
     if (uname(&name) >= 0) {
       ErrorF("Current Operating System: %s %s %s %s %s\n",
 	name.sysname, name.nodename, name.release, name.version, name.machine);
+#ifdef linux
+      do {
+	  char buf[80];
+	  int fd = open("/proc/cmdline", O_RDONLY);
+	  if (fd != -1) {
+	    ErrorF("Kernel command line: ");
+	    memset(buf, 0, 80);
+	    while (read(fd, buf, 80) > 0) {
+		ErrorF("%.80s", buf);
+		memset(buf, 0, 80);
+	    }
+	    close(fd);
+	  } 
+      } while (0);
+#endif
     }
   }
 #endif