picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

backlight: instead of syspath use sysname for identifying backlight devices

Browse source 
This makes the description string of the backlight service a bit nicer.
This commit is contained in:
Lennart Poettering 2013-08-14 02:55:57 +02:00
parent 3731acf1ac
commit 875c6e1b48
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rules/99-systemd.rules.in
View file

@ -53,7 +53,7 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy
# Pull in backlight save/restore for all firmware backlight devices
ACTION=="add", SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@sys%p.service"
ACTION=="add", SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service"
# Asynchronously mount file systems implemented by these modules as
# soon as they are loaded.

10
src/backlight/backlight.c
View file

@ -54,9 +54,15 @@ int main(int argc, char *argv[]) {
goto finish;
}
device = udev_device_new_from_syspath(udev, argv[2]);
errno = 0;
device = udev_device_new_from_subsystem_sysname(udev, "backlight", argv[2]);
if (!device) {
r = log_oom();
if (errno != 0) {
log_error("Failed to get backlight device: %m");
r = -errno;
} else
r = log_oom();
goto finish;
}

6
units/systemd-backlight@.service.in
View file

@ -6,7 +6,7 @@
# (at your option) any later version.
[Unit]
Description=Load/Save Screen Backlight Brightness of %f
Description=Load/Save Screen Backlight Brightness of %I
Documentation=man:systemd-backlight@.service(8)
DefaultDependencies=no
RequiresMountsFor=/var/lib/backlight
@ -17,5 +17,5 @@ Before=sysinit.target shutdown.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-backlight load %f
ExecStop=@rootlibexecdir@/systemd-backlight save %f
ExecStart=@rootlibexecdir@/systemd-backlight load %I
ExecStop=@rootlibexecdir@/systemd-backlight save %I