[systemd-commits] Makefile.am src/vconsole

[Michael Biebl]

 Makefile.am                       |    6 +++++-
 src/vconsole/.gitignore           |    1 +
 src/vconsole/90-vconsole.rules    |   11 -----------
 src/vconsole/90-vconsole.rules.in |   11 +++++++++++
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 3b0ed75c353946ba580a7724f9dbeb761e2067fe
Author: Michael Biebl <biebl at debian.org>
Date:   Sat Nov 29 06:35:38 2014 +0100

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

diff --git a/Makefile.am b/Makefile.am
index d4d96e1..ce8a004 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 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
deleted file mode 100644
index bf6a9ef..0000000
--- a/src/vconsole/90-vconsole.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-# 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"
diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
new file mode 100644
index 0000000..0620096
--- /dev/null
+++ b/src/vconsole/90-vconsole.rules.in
@@ -0,0 +1,11 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# Kernel resets vconsole state when changing console drivers so run
+# systemd-vconsole-setup when fbcon loads
+
+ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fbcon", RUN+="@rootlibexecdir@/systemd-vconsole-setup"