diff options
| author | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
| commit | 6a650df8c4ec834c03a51604942e32ec9c5741e7 (patch) | |
| tree | e54eb007b92269e6c4872770e62ef398ac347a8e /remote/modules/systemd/data/usr/lib/udev | |
| parent | [rfs-s31] append host info from dhcp instead of creating the file (diff) | |
| parent | [systemd] Clean up build file (diff) | |
| download | tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.gz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.xz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
Diffstat (limited to 'remote/modules/systemd/data/usr/lib/udev')
| -rw-r--r-- | remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules index c148de7a..99cdf676 100644 --- a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules +++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules @@ -31,7 +31,9 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T # # http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742 -#SUBSYSTEM=="net", KERNEL=="eth*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service" +SUBSYSTEM=="net", KERNEL=="eth*", TAG=="openslxignore", GOTO="systemd_end" + +SUBSYSTEM=="net", KERNEL=="br0|eth*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service" SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k" SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target" @@ -43,8 +45,7 @@ SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.tar SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target" # Apply sysctl variables to network devices (and only to those) as they appear. - -#SUBSYSTEM=="net", KERNEL=="eth*", RUN+="/usr/lib/systemd/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" +SUBSYSTEM=="net", KERNEL=="eth*", RUN+="/usr/lib/systemd/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" # Asynchronously mount file systems implemented by these modules as # soon as they are loaded. |