[systemd-commits] 4 commits - shell-completion/systemd-bash-completion.sh src/libudev src/udev
Kay Sievers
kay at kemper.freedesktop.org
Tue Nov 20 09:19:15 PST 2012
shell-completion/systemd-bash-completion.sh | 2
src/libudev/libudev-device.c | 19 ++--
src/udev/udev-builtin-net_id.c | 118 +++++++++++++++++++++++++---
src/udev/udev-event.c | 36 ++++----
4 files changed, 136 insertions(+), 39 deletions(-)
New commits:
commit d23965a64eb5c2c97b839dc2e3e79fc1613994f1
Author: Kay Sievers <kay at vrfy.org>
Date: Tue Nov 20 18:10:45 2012 +0100
udev: net - add device naming properties
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index eff4552..72237bf 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -17,6 +17,17 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+/*
+ * eno<index> -- ethernet on-board
+ * ID_NET_NAME_FIRMWARE=eno1
+ *
+ * enp<pci bus number>s<slot>f<function> -- physical location/path
+ * ID_NET_NAME_PATH=enp19s0f0
+ *
+ * enm<MAC address> -- MAC address
+ * ID_NET_NAME_MAC=enxf0def180d479
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -26,25 +37,110 @@
#include "udev.h"
-/* IEEE Organizationally Unique Identifier */
-static int lookup_OUI(struct udev_device *dev, bool test) {
- const char *addr;
- unsigned int a1, a2, a3;
- char oui[16];
+static int dev_pci(struct udev_device *dev, const char *prefix, bool test) {
+ struct udev_device *d;
+ unsigned int bus;
+ unsigned int slot;
+ unsigned int func;
+ const char *index;
+ int err;
- addr = udev_device_get_sysattr_value(dev, "address");
- if (!addr)
+ /* skip other buses than direct PCI parents */
+ d = udev_device_get_parent(dev);
+ if (!d || !streq("pci", udev_device_get_subsystem(d)))
return -ENOENT;
- if (sscanf(addr, "%x:%x:%x:", &a1, &a2, &a3) != 3)
+ /* find SMBIOS type 41 entries for on-board devices */
+ index = udev_device_get_sysattr_value(d, "index");
+ if (index) {
+ unsigned int idx;
+
+ idx = strtoul(index, NULL, 0);
+ if (idx > 0) {
+ const char *label;
+ char s[16];
+
+ snprintf(s, sizeof(s), "%so%d", prefix, idx);
+ udev_builtin_add_property(dev, test, "ID_NET_NAME_FIRMWARE", s);
+
+ label = udev_device_get_sysattr_value(d, "label");
+ if (label)
+ udev_builtin_add_property(dev, test, "ID_NET_LABEL_FIRMWARE", label);
+ }
+ }
+
+ /* compose a name based on the PCI bus location */
+ if (sscanf(udev_device_get_sysname(d), "0000:%x:%x.%d", &bus, &slot, &func) == 3) {
+ char str[16];
+
+ snprintf(str, sizeof(str), "%sp%ds%df%d", prefix, bus, slot, func);
+ err = udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str);
+ if (err < 0)
+ return err;
+ }
+ return 0;
+}
+
+static int dev_mac(struct udev_device *dev, const char *prefix, bool test) {
+ const char *s;
+ unsigned int i;
+ unsigned int a1, a2, a3, a4, a5, a6;
+ char str[16];
+ int err;
+
+ /* check for NET_ADDR_PERM, skip random MAC addresses */
+ s = udev_device_get_sysattr_value(dev, "addr_assign_type");
+ if (!s)
+ return EXIT_FAILURE;
+ i = strtoul(s, NULL, 0);
+ if (i != 0)
+ return 0;
+
+ s = udev_device_get_sysattr_value(dev, "address");
+ if (!s)
+ return -ENOENT;
+ if (sscanf(s, "%x:%x:%x:%x:%x:%x", &a1, &a2, &a3, &a4, &a5, &a6) != 6)
+ return -EINVAL;
+
+ /* skip empty MAC addresses */
+ if (a1 + a2 + a3 + a4 + a5 + a6 == 0)
return -EINVAL;
- snprintf(oui, sizeof(oui), "OUI:%X%X%X", a1, a2, a3);
- return udev_builtin_hwdb_lookup(dev, oui, test);
+ /* add IEEE Organizationally Unique Identifier */
+ snprintf(str, sizeof(str), "OUI:%X%X%X", a1, a2, a3);
+ udev_builtin_hwdb_lookup(dev, str, test);
+
+ snprintf(str, sizeof(str), "%sx%x%x%x%x%x%x", prefix, a1, a2, a3, a4, a5, a6);
+ err = udev_builtin_add_property(dev, test, "ID_NET_NAME_MAC", str);
+ if (err < 0)
+ return err;
+ return 0;
}
static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool test) {
- lookup_OUI(dev, test);
+ const char *s;
+ unsigned int i;
+ const char *devtype;
+ const char *prefix = "en";
+
+ /* handle only ARPHRD_ETHER devices */
+ s = udev_device_get_sysattr_value(dev, "type");
+ if (!s)
+ return EXIT_FAILURE;
+ i = strtoul(s, NULL, 0);
+ if (i != 1)
+ return 0;
+
+ devtype = udev_device_get_devtype(dev);
+ if (devtype) {
+ if (streq("wlan", devtype))
+ prefix = "wl";
+ else if (streq("wwan", devtype))
+ prefix = "ww";
+ }
+
+ dev_pci(dev, prefix, test);
+ dev_mac(dev, prefix, test);
return EXIT_SUCCESS;
}
commit 66128b2b4d9a1fe3d65ccad3d916f5db07a765ca
Author: Kay Sievers <kay at vrfy.org>
Date: Tue Nov 20 18:08:48 2012 +0100
shell-completion: udev - add net_id
diff --git a/shell-completion/systemd-bash-completion.sh b/shell-completion/systemd-bash-completion.sh
index c1b851c..897f988 100644
--- a/shell-completion/systemd-bash-completion.sh
+++ b/shell-completion/systemd-bash-completion.sh
@@ -597,7 +597,7 @@ _udevadm() {
fi
elif __contains_word "$verb" ${VERBS[TESTBUILTIN]}; then
- comps='blkid btrfs firmware hwdb input_id kmod path_id usb_id uaccess'
+ comps='blkid btrfs firmware hwdb input_id kmod net_id path_id usb_id uaccess'
fi
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
commit 5ae18ddc0d86673520c0dd6b59ccac8afc8aa605
Author: Kay Sievers <kay at vrfy.org>
Date: Tue Nov 20 18:07:57 2012 +0100
libudev: do not resolve $attr{device} symlinks
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index acf8e24..d246d01 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1358,16 +1358,17 @@ _public_ const char *udev_device_get_sysattr_value(struct udev_device *udev_devi
goto out;
}
- /* resolve link to a device and return its syspath */
- util_strscpyl(path, sizeof(path), udev_device->syspath, "/", sysattr, NULL);
- dev = udev_device_new_from_syspath(udev_device->udev, path);
- if (dev != NULL) {
- list_entry = udev_list_entry_add(&udev_device->sysattr_value_list, sysattr,
- udev_device_get_syspath(dev));
- val = udev_list_entry_get_value(list_entry);
- udev_device_unref(dev);
+ /* resolve custom link to a device and return its syspath */
+ if (!streq(sysattr, "device")) {
+ util_strscpyl(path, sizeof(path), udev_device->syspath, "/", sysattr, NULL);
+ dev = udev_device_new_from_syspath(udev_device->udev, path);
+ if (dev != NULL) {
+ list_entry = udev_list_entry_add(&udev_device->sysattr_value_list, sysattr,
+ udev_device_get_syspath(dev));
+ val = udev_list_entry_get_value(list_entry);
+ udev_device_unref(dev);
+ }
}
-
goto out;
}
commit 3fd0c4c66df45ee457cfb5e4ca8e285914ebc32f
Author: Kay Sievers <kay at vrfy.org>
Date: Tue Nov 20 18:07:14 2012 +0100
udev: fix whitespace
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 33ed477..b75ed33 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -90,24 +90,24 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
const char fmt;
enum subst_type type;
} map[] = {
- { .name = "devnode", .fmt = 'N', .type = SUBST_DEVNODE },
- { .name = "tempnode", .fmt = 'N', .type = SUBST_DEVNODE },
- { .name = "attr", .fmt = 's', .type = SUBST_ATTR },
- { .name = "sysfs", .fmt = 's', .type = SUBST_ATTR },
- { .name = "env", .fmt = 'E', .type = SUBST_ENV },
- { .name = "kernel", .fmt = 'k', .type = SUBST_KERNEL },
- { .name = "number", .fmt = 'n', .type = SUBST_KERNEL_NUMBER },
- { .name = "driver", .fmt = 'd', .type = SUBST_DRIVER },
- { .name = "devpath", .fmt = 'p', .type = SUBST_DEVPATH },
- { .name = "id", .fmt = 'b', .type = SUBST_ID },
- { .name = "major", .fmt = 'M', .type = SUBST_MAJOR },
- { .name = "minor", .fmt = 'm', .type = SUBST_MINOR },
- { .name = "result", .fmt = 'c', .type = SUBST_RESULT },
- { .name = "parent", .fmt = 'P', .type = SUBST_PARENT },
- { .name = "name", .fmt = 'D', .type = SUBST_NAME },
- { .name = "links", .fmt = 'L', .type = SUBST_LINKS },
- { .name = "root", .fmt = 'r', .type = SUBST_ROOT },
- { .name = "sys", .fmt = 'S', .type = SUBST_SYS },
+ { .name = "devnode", .fmt = 'N', .type = SUBST_DEVNODE },
+ { .name = "tempnode", .fmt = 'N', .type = SUBST_DEVNODE },
+ { .name = "attr", .fmt = 's', .type = SUBST_ATTR },
+ { .name = "sysfs", .fmt = 's', .type = SUBST_ATTR },
+ { .name = "env", .fmt = 'E', .type = SUBST_ENV },
+ { .name = "kernel", .fmt = 'k', .type = SUBST_KERNEL },
+ { .name = "number", .fmt = 'n', .type = SUBST_KERNEL_NUMBER },
+ { .name = "driver", .fmt = 'd', .type = SUBST_DRIVER },
+ { .name = "devpath", .fmt = 'p', .type = SUBST_DEVPATH },
+ { .name = "id", .fmt = 'b', .type = SUBST_ID },
+ { .name = "major", .fmt = 'M', .type = SUBST_MAJOR },
+ { .name = "minor", .fmt = 'm', .type = SUBST_MINOR },
+ { .name = "result", .fmt = 'c', .type = SUBST_RESULT },
+ { .name = "parent", .fmt = 'P', .type = SUBST_PARENT },
+ { .name = "name", .fmt = 'D', .type = SUBST_NAME },
+ { .name = "links", .fmt = 'L', .type = SUBST_LINKS },
+ { .name = "root", .fmt = 'r', .type = SUBST_ROOT },
+ { .name = "sys", .fmt = 'S', .type = SUBST_SYS },
};
const char *from;
char *s;
More information about the systemd-commits
mailing list