X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=99-systemd.rules;h=e88f10a6edb0138a3f75aaabdf4b8a40099b2969;hb=f58eedd538b3a138814a54b94b0c2c89ef727d82;hp=c7c2073b8f49dca33a2fda01f4ef4d01fe97facb;hpb=5cc5d790f4593bbf7829faba502e4c00b3718a08;p=elogind.git

diff --git a/99-systemd.rules b/99-systemd.rules
index c7c2073b8..e88f10a6e 100644
--- a/99-systemd.rules
+++ b/99-systemd.rules
@@ -1,9 +1,38 @@
-# do not edit this file, it will be overwritten on update
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-ACTION!="new|change", GOTO="systemd_end"
+ACTION!="add|change", GOTO="systemd_end"
 
-KERNEL=="tty[0-9]|tty1[0-2]", GOTO="systemd_end"
+KERNEL=="tty[0-9]|tty1[0-2]", ENV{SYSTEMD_EXPOSE}="1"
+KERNEL=="ttyS*", ENV{SYSTEMD_EXPOSE}="1"
 
-KERNEL=="tty[0-9]*", ENV{SYSTEMD_EXPOSE}="0"
+SUBSYSTEM=="block", ENV{SYSTEMD_EXPOSE}="1"
+
+# We need a hardware independent way to identify network devices. We
+# use the /sys/subsystem path for this. Current vanilla kernels don't
+# actually support that hierarchy right now, however upcoming kernels
+# will. HAL and udev internally support /sys/subsystem already, hence
+# it should be safe to use this here, too. This is mostly just an
+# identification string for systemd, so whether the path actually is
+# accessible or not does not matter as long as it is unique and in the
+# filesystem namespace.
+#
+# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
+
+SUBSYSTEM=="net", KERNEL!="lo", ENV{SYSTEMD_EXPOSE}="1", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/%k"
 
 LABEL="systemd_end"