From 624710450d758e7ec3e8766e5c65cf832b5bd90e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 26 Feb 2011 20:19:34 +0100 Subject: [PATCH] xorg-server: cleanup the udev rule a bit Signed-off-by: Stephan Raue --- .../x11/xserver/xorg-server/udev.d/97-xorg.rules | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules index 536a82b63a..2ca8124078 100644 --- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules +++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules @@ -23,27 +23,24 @@ ACTION!="add|change", GOTO="end_video" # xorg_start only does something for subsystem "pci" and "video" class. SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci" SUBSYSTEM=="drivers", GOTO="subsystem_drivers" +GOTO="end_video" # check for drivers dont use the pci substem LABEL="subsystem_drivers" - -KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg" - +KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg" GOTO="end_video" # check for drivers using the pci substem LABEL="subsystem_pci" - DRIVER=="i915", ENV{xorg_driver}="i915", GOTO="start_xorg" DRIVER=="nouveau", ENV{xorg_driver}="nouveau", GOTO="start_xorg" +#DRIVER=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg" DRIVER=="radeon", ENV{xorg_driver}="radeon", GOTO="start_xorg" -#DRIVER=="vmware", ENV{xorg_driver}="vmware", GOTO="start_xorg" - +DRIVER=="vmware", ENV{xorg_driver}="vmware", GOTO="start_xorg" GOTO="end_video" # start Xorg LABEL="start_xorg" - -ACTION=="add|change", RUN+="/lib/udev/xorg_start" +ENV{xorg_driver}=="?*", RUN+="/lib/udev/xorg_start" LABEL="end_video"