From: Michael Biebl <biebl@debian.org>
Date: Sat, 29 Nov 2014 05:35:38 +0000 (+0100)
Subject: vconsole: don't hard-code systemd-vconsole-setup binary path
X-Git-Tag: v218~131
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3b0ed75c353946ba580a7724f9dbeb761e2067fe;hp=6c03d27d9f7e831194dbd8bd6bcdeef9273edb6e

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

diff --git a/Makefile.am b/Makefile.am
index d4d96e134..ce8a004f4 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 000000000..82741b2fb
--- /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 bf6a9efaa..062009640 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"