vconsole: don't hard-code systemd-vconsole-setup binary path

diff --git a/Makefile.am b/Makefile.am
index d4d96e134f4ad9881363c293cc4f3e4302bcb8c6..ce8a004f4e69dc223231aea5e52c9902bf82f192 100644 (file)
--- 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 (file)
index 0000000..82741b2
--- /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
similarity index 79%
rename from src/vconsole/90-vconsole.rules
rename to src/vconsole/90-vconsole.rules.in
index bf6a9efaa5423dde84f4196abcdb97f6b89acff2..062009640c9751014346c6b23a8f46856a40fcf6 100644 (file)
--- 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"