From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 23 Dec 2011 02:23:37 +0000 (+0100)
Subject: rules: do not preprocess 60-persistent-storage.rules
X-Git-Tag: 176~50
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=009cc08c7b85bc6d69145a4b1efd7be534da1b45;p=systemd

rules: do not preprocess 60-persistent-storage.rules
---

diff --git a/Makefile.am b/Makefile.am
index eb9ee931..0064631e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,19 +144,17 @@ dist_udevrules_DATA = \
 	rules/rules.d/60-persistent-serial.rules \
 	rules/rules.d/60-persistent-input.rules \
 	rules/rules.d/60-persistent-alsa.rules \
+	rules/rules.d/60-persistent-storage.rules \
 	rules/rules.d/95-udev-late.rules
 
 udevrules_DATA = \
-	rules/rules.d/60-persistent-storage.rules \
 	rules/rules.d/80-drivers.rules
 
 EXTRA_DIST += \
-	rules/rules.d/80-drivers.rules.in \
-	rules/rules.d/60-persistent-storage.rules.in
+	rules/rules.d/80-drivers.rules.in
 
 CLEANFILES += \
-	rules/rules.d/80-drivers.rules \
-	rules/rules.d/60-persistent-storage.rules
+	rules/rules.d/80-drivers.rules
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
diff --git a/rules/.gitignore b/rules/.gitignore
index 7240bd79..16f9c2da 100644
--- a/rules/.gitignore
+++ b/rules/.gitignore
@@ -1,2 +1 @@
-rules.d/60-persistent-storage.rules
 rules.d/80-drivers.rules
diff --git a/rules/rules.d/60-persistent-storage.rules.in b/rules/rules.d/60-persistent-storage.rules
similarity index 100%
rename from rules/rules.d/60-persistent-storage.rules.in
rename to rules/rules.d/60-persistent-storage.rules