From: Ray Strode Date: Wed, 20 Jun 2012 15:19:05 +0000 (-0400) Subject: systemd: drop weird udev trigger --attr-match=class=0x030000 X-Git-Tag: 0.8.6~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8031858cd2e1e8b47e577bc69443777921a65cd;p=thirdparty%2Fplymouth.git systemd: drop weird udev trigger --attr-match=class=0x030000 plymouth-start.service does this sort of hacky "udevadm trigger" stuff before doing plymouth show-splash, to ensure plymouth show-splash is called after the graphcis subsystem is up. It actually does two calls: - one call that triggers any pci devices with the class 0x030000 (which is "vga compatible display device") - another call that triggers the gpu subsystem The first call is borrowed from dracut: http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=commitdiff;h=2c02c8318 and I can't find any historical context on why its needed. As I understand things, the latter should be a superset of the former. Furthermore, the first trigger is missing a --subsystem-match=pci call so it's matching the "class" attribute in every subsystem, which is slow. I'm going to drop the first trigger until I start hitting problems and need to add it back. --- diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in index f2c6c84e..3fc4a7f4 100644 --- a/systemd-units/plymouth-start.service.in +++ b/systemd-units/plymouth-start.service.in @@ -9,5 +9,5 @@ ConditionPathExists=!@plymouthruntimedir@/pid [Service] ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -ExecStartPost=-/bin/udevadm trigger --action=add --attr-match=class=0x030000 ; -/bin/udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty ; -/bin/udevadm settle --timeout=30 ; -@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +ExecStartPost=-/bin/udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty ; -/bin/udevadm settle --timeout=30 ; -@PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking