On Wed, Jan 28, 2009 at 12:35 PM, Agathoklis D. Hatzimanikas <[email protected]> wrote: > On Wed, Jan 28, at 11:54 Dan Nicholson wrote: >> >> Could you attach the log and your xorg.conf from a failed run?
Thanks. Could you try this patch? It's against 1.5.3. -- Dan
From 4aea71c046c8d0ddde592b335a8ebeb2541fa187 Mon Sep 17 00:00:00 2001 From: Dan Nicholson <[email protected]> Date: Wed, 28 Jan 2009 13:17:36 -0800 Subject: [PATCH] xfree86: Disable all hotplugging features without CONFIG_HAL If HAL configuration has not been built into the server, force AutoAddDevices, AutoEnableDevices and AllowEmptyInput to FALSE. The only way to use input devices in this configuration is through xorg.conf. Signed-off-by: Dan Nicholson <[email protected]> --- hw/xfree86/common/xf86Config.c | 14 ++++++++++++++ hw/xfree86/doc/man/xorg.conf.man.pre | 8 ++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index e91eadd..0adb273 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -916,6 +916,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) xf86Msg(X_CONFIG, "Ignoring ABI Version\n"); } +#ifdef CONFIG_HAL if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_DEVICES)) { xf86GetOptValBool(FlagOptions, FLAG_AUTO_ADD_DEVICES, &xf86Info.autoAddDevices); @@ -925,9 +926,14 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) xf86Info.autoAddDevices = TRUE; from = X_DEFAULT; } +#else + xf86Info.autoAddDevices = FALSE; + from = X_DEFAULT; +#endif xf86Msg(from, "%sutomatically adding devices\n", xf86Info.autoAddDevices ? "A" : "Not a"); +#ifdef CONFIG_HAL if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ENABLE_DEVICES)) { xf86GetOptValBool(FlagOptions, FLAG_AUTO_ENABLE_DEVICES, &xf86Info.autoEnableDevices); @@ -937,6 +943,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) xf86Info.autoEnableDevices = TRUE; from = X_DEFAULT; } +#else + xf86Info.autoEnableDevices = FALSE; + from = X_DEFAULT; +#endif xf86Msg(from, "%sutomatically enabling devices\n", xf86Info.autoEnableDevices ? "A" : "Not a"); @@ -1088,9 +1098,13 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } #endif +#ifdef CONFIG_HAL /* AllowEmptyInput is automatically true if we're hotplugging */ xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices); xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput); +#else + xf86Info.allowEmptyInput = FALSE; +#endif xf86Info.useDefaultFontPath = TRUE; xf86Info.useDefaultFontPathFrom = X_DEFAULT; diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index de93aaf..4fc119c 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -696,19 +696,19 @@ the X server to load. Disabled by default. .TP 7 .BI "Option \*qAllowEmptyInput\*q \*q" boolean \*q If enabled, don't add the standard keyboard and mouse drivers, if there are no -input devices in the config file. Enabled by default if AutoAddDevices and -AutoEnableDevices is enabled, otherwise disabled. +input devices in the config file. Enabled by default if Xorg has HAL support +and AutoAddDevices and AutoEnableDevices are enabled, otherwise disabled. If AllowEmptyInput is on, devices using the kbd or mouse driver are ignored. .TP 7 .BI "Option \*qAutoAddDevices\*q \*q" boolean \*q If this option is disabled, then no devices will be added from HAL events. -Enabled by default. +Enabled by default if Xorg has HAL support. .TP 7 .BI "Option \*qAutoEnableDevices\*q \*q" boolean \*q If this option is disabled, then the devices will be added (and the DevicePresenceNotify event sent), but not enabled, thus leaving policy up to the client. -Enabled by default. +Enabled by default if Xorg has HAL support. .SH "MODULE SECTION" The .B Module -- 1.5.6.6
-- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
