From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 7 Oct 2014 06:02:59 +0000 (-0400)
Subject: /proc/sys prefixes are not necessary for sysctl anymore
X-Git-Tag: v217~290
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1b600437bac3c0676cc72f589909c4cbfe38ba10

/proc/sys prefixes are not necessary for sysctl anymore
---

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 5529fc98b..3002ebd0f 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -158,7 +158,7 @@
                         <para><filename>/etc/udev/rules.d/99-bridge.rules</filename>:
                         </para>
 
-                        <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/bridge"
+                        <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/net/bridge"
 </programlisting>
 
                         <para><filename>/etc/sysctl.d/bridge.conf</filename>:
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index aa435c414..e30d9a8f1 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -52,7 +52,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:
 
 # Apply sysctl variables to network devices (and only to those) as they appear.
 
-ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
+ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$name --prefix=/net/ipv6/conf/$name --prefix=/net/ipv6/neigh/$name"
 
 # Pull in backlight save/restore for all backlight devices and
 # keyboard backlights