520bba9947
- Today's git snapshot. - disable Xdmx - it's broken upstream - Removing patches merged upstream or obsolete. xserver-1.4.99-endian.patch - obsolete with autoconf 2.63-1 (#449944) xserver-1.5.99.902-sod-off-poulsbo.patch - upstream xserver-1.6.0-selinux-less.patch - upstream xserver-1.5.99.902-vnc.patch - upstream xserver-1.6.0-restore-zap.patch - upstream xserver-1.6.0-xinerama-cursors.patch - upstream xserver-1.6.0-xinerama-crashes.patch - obsolete, server 1.6 only xserver-1.6.1-xkbsendmap.patch - upstream xserver-1.6.0-randr-xinerama-crash.patch - upstream xserver-1.6.1-avoid-malloc-for-logging.patch - upstream xserver-1.6.1-exa-avoid-swapped-out.patch - upstream xserver-1.6.1-exa-create-pixmap2.patch - upstream xserver-1.6.1-fix-glx-drawable.patch - upstream xserver-1.6.1-randr-gamma.patch - upstream xserver-1.6.1-vt-switch.patch - obsolete xserver-1.6.1-pea-quirk.patch - will be upstream
37 lines
1022 B
Diff
37 lines
1022 B
Diff
From 794214c9da2b17c3291ec53b178a035a1f117430 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Thu, 7 May 2009 17:18:31 -0400
|
|
Subject: [PATCH] Dump /proc/cmdline in the log file too.
|
|
|
|
---
|
|
hw/xfree86/common/xf86Init.c | 13 +++++++++++++
|
|
1 files changed, 13 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
|
index 2493526..7c0937f 100644
|
|
--- a/hw/xfree86/common/xf86Init.c
|
|
+++ b/hw/xfree86/common/xf86Init.c
|
|
@@ -193,6 +193,19 @@ 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);
|
|
+ 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
|
|
--
|
|
1.6.2.2
|
|
|