From 7793693d02c121d5dcff0d74aaa04816d074cf3f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 7 Oct 2013 04:22:16 +0200 Subject: [PATCH] xorg-server: fix udev rule to work with drivers as modules or statically builtin Signed-off-by: Stephan Raue --- .../xserver/xorg-server/udev.d/97-xorg.rules | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 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 648c4d13d3..fed2f84825 100644 --- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules +++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules @@ -18,26 +18,15 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -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" +ACTION!="add|change", SUBSYSTEM!="drivers", GOTO="end_video" # check for drivers dont use the pci substem -LABEL="subsystem_drivers" KERNEL=="dovefb", ENV{xorg_driver}="dove", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@dove.service" +KERNEL=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service" +KERNEL=="nouveau", ENV{xorg_driver}="nouveau", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nouveau.service" KERNEL=="nvidia", ENV{xorg_driver}="nvidia", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nvidia.service" +KERNEL=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service" KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vboxvideo.service" KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service" -GOTO="end_video" - -# check for drivers using the pci substem -LABEL="subsystem_pci" -DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service" -DRIVER=="nouveau", ENV{xorg_driver}="nouveau", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nouveau.service" -DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service" -GOTO="end_video" LABEL="end_video"