summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-25 20:24:58 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-25 20:25:49 +0200
commit41e4d6e9ace4f3b717af3c0419b69a2ac7935116 (patch)
tree057e9b7e0123c59cd4b6bbd748fede55c2d051b4
parent8d41a963d66e54807e8b0fa69700107e39cf485a (diff)
sysctl: apply network specific sysctls to each network card as they appear
-rw-r--r--Makefile.am12
-rw-r--r--TODO2
-rw-r--r--src/.gitignore1
-rw-r--r--src/99-systemd.rules.in (renamed from src/99-systemd.rules)2
4 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 2ebf53ce86..d99a2485fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,11 +239,11 @@ dist_dbussystemservice_DATA = \
dist_udevrules_DATA = \
src/70-uaccess.rules \
- src/71-seat.rules \
- src/99-systemd.rules
+ src/71-seat.rules
nodist_udevrules_DATA = \
- src/73-seat-late.rules
+ src/73-seat-late.rules \
+ src/99-systemd.rules
dbusinterface_DATA = \
org.freedesktop.systemd1.Manager.xml \
@@ -434,7 +434,8 @@ EXTRA_DIST = \
src/libsystemd-daemon.sym \
src/libsystemd-login.sym \
introspect.awk \
- src/73-seat-late.rules.in
+ src/73-seat-late.rules.in \
+ src/99-systemd.rules.in
if ENABLE_BINFMT
EXTRA_DIST += \
@@ -1487,7 +1488,8 @@ CLEANFILES = \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA) \
$(nodist_polkitpolicy_DATA) \
- src/73-seat-late.rules
+ src/73-seat-late.rules \
+ src/99-systemd.rules
if HAVE_VALAC
CLEANFILES += \
diff --git a/TODO b/TODO
index feac225cb5..0a1f98d552 100644
--- a/TODO
+++ b/TODO
@@ -38,8 +38,6 @@ Features:
* logind: use sysfs path in device hash table instead of sysname, as soon as fb driver is fixed
-* possibly apply systemd-sysctl per network device subtrees on hotplug
-
* implement Register= switch in .socket units to enable registration
in Avahi, RPC and other socket registration services.
diff --git a/src/.gitignore b/src/.gitignore
index 8832dd6d3f..6c4ccaa2dd 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+99-systemd.rules
org.freedesktop.hostname1.policy
org.freedesktop.locale1.policy
org.freedesktop.login1.policy
diff --git a/src/99-systemd.rules b/src/99-systemd.rules.in
index f015d5e67b..f3829ad049 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules.in
@@ -41,4 +41,6 @@ SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+SUBSYSTEM=="net", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/%k --prefix=/proc/sys/net/ipv4/neigh/%k --prefix=/proc/sys/net/ipv6/conf/%k --prefix=/proc/sys/net/ipv4/conf/%k"
+
LABEL="systemd_end"