[systemd-commits] 2 commits - Makefile.am man/udevadm.xml

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am     |    4 +++-
 man/udevadm.xml |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e2eb18d56b14eeb405706970f0460d8539cdcf23
Author: Armin K <krejzi at email.com>
Date:   Tue Mar 4 16:23:41 2014 +0100

    build-sys: Don't distribute generated udev rule
    
    It contains hardcoded path to systemd-sysctl executable which
    is /usr/lib/systemd/systemd-sysctl on latest stable release and
    as such it will complain at runtime if rootprefix != prefix
    
    [zj: readd the file to nodist_udevrules_DATA]

diff --git a/Makefile.am b/Makefile.am
index 6cc8316..2db58a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2572,7 +2572,6 @@ dist_network_DATA = \
 	network/80-container-host0.network
 
 dist_udevrules_DATA += \
-	rules/99-systemd.rules \
 	rules/42-usb-hid-pm.rules \
 	rules/50-udev-default.rules \
 	rules/60-drm.rules \
@@ -2589,6 +2588,9 @@ dist_udevrules_DATA += \
 	rules/80-net-setup-link.rules \
 	rules/95-udev-late.rules
 
+nodist_udevrules_DATA += \
+	rules/99-systemd.rules
+
 dist_udevhwdb_DATA = \
 	hwdb/20-pci-vendor-model.hwdb \
 	hwdb/20-pci-classes.hwdb \

commit 7d06ef0a5cd2f0a4e021d3d12f3841cce529e0f2
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Mar 6 23:54:13 2014 -0500

    man: add missing comma
    
    marcosf0> missing comma in udevadm "see also" section

diff --git a/man/udevadm.xml b/man/udevadm.xml
index a3f8d54..21d1443 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -594,7 +594,7 @@
     <title>See Also</title>
     <para><citerefentry>
         <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
-    </citerefentry>
+    </citerefentry>,
     <citerefentry>
         <refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum>
     </citerefentry></para>