[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#318934: more fixes



Hi!

Here's one more patch to fix a bug in which, on GNU/kFreeBSD, the Debian X
server wrapper didn't recognise our local terminals as such (the check is done
via kernel-specific major number).

Also, please discard add_manifest_and_friends.diff.  Aurelien Jarno told me he
has a newer version of these files and will send them soon.

-- 
Robert Millan
--- xorg-x11-6.8.2.dfsg.1/debian/local/xserver-wrapper.c~       2005-07-20 22:16:31.000000000 +0200
+++ xorg-x11-6.8.2.dfsg.1/debian/local/xserver-wrapper.c        2005-07-22 20:21:14.000000000 +0200
@@ -104,7 +104,14 @@
 # include <sys/resource.h>
 #endif

+/* Define major number for local console terminals */
+#if defined(__linux__)
 #define VT_MAJOR_DEV 4
+#elif defined(__FreeBSD_kernel__)
+#define VT_MAJOR_DEV 234
+#else
+#error Add your kernel here
+#endif
 #define X_WRAPPER_CONFIG_FILE "/etc/X11/Xwrapper.config"
 #define X_SERVER_SYMLINK_DIR "/etc/X11"
 #define X_SERVER_SYMLINK "/etc/X11/X"

Reply to: