sysctl: apply network specific sysctls to each network card as they appear

diff --git a/Makefile.am b/Makefile.am
index 2ebf53ce867f586fa146dd4dd83ad37168023949..d99a2485facf50e441f6af43da7ad2e1c38d9a06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,11 +239,11 @@ dist_dbussystemservice_DATA = \
 
 dist_udevrules_DATA = \
         src/70-uaccess.rules \
 
 dist_udevrules_DATA = \
         src/70-uaccess.rules \

-        src/71-seat.rules \
-       src/99-systemd.rules
+        src/71-seat.rules

 
 nodist_udevrules_DATA = \
 
 nodist_udevrules_DATA = \

-        src/73-seat-late.rules
+        src/73-seat-late.rules \
+        src/99-systemd.rules

 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \


@@ -434,7 +434,8 @@ EXTRA_DIST = \
        src/libsystemd-daemon.sym \
        src/libsystemd-login.sym \
        introspect.awk \
        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 += \
 
 if ENABLE_BINFMT
 EXTRA_DIST += \


@@ -1487,7 +1488,8 @@ CLEANFILES = \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
        $(nodist_polkitpolicy_DATA) \
        ${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 += \
 
 if HAVE_VALAC
 CLEANFILES += \

diff --git a/TODO b/TODO
index feac225cb5983aca8f59d4bdf92f4e713fe77596..0a1f98d5529d3bdde6739afeb82fff13eb085a41 100644 (file)
--- 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
 
 
 * 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.
 
 * 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 8832dd6d3fff2220184ed8211b6c1f25c33ff015..6c4ccaa2ddcbeb9cd6205611e2b50613cd56315c 100644 (file)
--- 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
 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
similarity index 92%
rename from src/99-systemd.rules
rename to src/99-systemd.rules.in
index f015d5e67b4417499e62f46834bf45b05f1e4a99..f3829ad049e5d0205eb602da8635bbe61b148ba8 100644 (file)
--- 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=="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"
 LABEL="systemd_end"