diff options
| author | Michael Biebl <biebl@debian.org> | 2014-11-29 06:35:38 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-12-04 00:05:04 +0100 |
| commit | 3b0ed75c353946ba580a7724f9dbeb761e2067fe (patch) | |
| tree | 8f78550c76672ef77a57429337951ca0fbca773b | |
| parent | 6c03d27d9f7e831194dbd8bd6bcdeef9273edb6e (diff) | |
vconsole: don't hard-code systemd-vconsole-setup binary path
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/vconsole/.gitignore | 1 | ||||
| -rw-r--r-- | src/vconsole/90-vconsole.rules.in (renamed from src/vconsole/90-vconsole.rules) | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d4d96e134f..ce8a004f4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4478,14 +4478,18 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-vconsole-setup.service -dist_udevrules_DATA += \ +nodist_udevrules_DATA += \ src/vconsole/90-vconsole.rules SYSINIT_TARGET_WANTS += \ systemd-vconsole-setup.service + +CLEANFILES += \ + src/vconsole/90-vconsole.rules endif EXTRA_DIST += \ + src/vconsole/90-vconsole.rules.in \ units/systemd-vconsole-setup.service.in # ------------------------------------------------------------------------------ diff --git a/src/vconsole/.gitignore b/src/vconsole/.gitignore new file mode 100644 index 0000000000..82741b2fb3 --- /dev/null +++ b/src/vconsole/.gitignore @@ -0,0 +1 @@ +/90-vconsole.rules diff --git a/src/vconsole/90-vconsole.rules b/src/vconsole/90-vconsole.rules.in index bf6a9efaa5..062009640c 100644 --- a/src/vconsole/90-vconsole.rules +++ b/src/vconsole/90-vconsole.rules.in @@ -8,4 +8,4 @@ # Kernel resets vconsole state when changing console drivers so run # systemd-vconsole-setup when fbcon loads -ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="/usr/lib/systemd/systemd-vconsole-setup" +ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="@rootlibexecdir@/systemd-vconsole-setup" |