X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin.c;h=fabc6538001795c97f17a80686211fecb4dc5ba7;hp=6b3a518c2e57c949ba0dd09ebd8f7444fd73acbd;hb=b94da8cf72aa363582e0acae134d45c88d13bc75;hpb=9d7d42bc406a2ac04639674281ce3ff6beeda790
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 6b3a518c2..fabc65380 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -17,12 +17,8 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
-#include
#include
-#include
#include
#include "udev.h"
@@ -34,9 +30,6 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
-#ifdef HAVE_FIRMWARE
- [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
-#endif
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
@@ -44,6 +37,7 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
#endif
[UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
+ [UDEV_BUILTIN_NET_LINK] = &udev_builtin_net_setup_link,
[UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
[UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
#ifdef HAVE_ACL
@@ -51,8 +45,7 @@ static const struct udev_builtin *builtins[] = {
#endif
};
-void udev_builtin_init(struct udev *udev)
-{
+void udev_builtin_init(struct udev *udev) {
unsigned int i;
if (initialized)
@@ -65,8 +58,7 @@ void udev_builtin_init(struct udev *udev)
initialized = true;
}
-void udev_builtin_exit(struct udev *udev)
-{
+void udev_builtin_exit(struct udev *udev) {
unsigned int i;
if (!initialized)
@@ -79,8 +71,7 @@ void udev_builtin_exit(struct udev *udev)
initialized = false;
}
-bool udev_builtin_validate(struct udev *udev)
-{
+bool udev_builtin_validate(struct udev *udev) {
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
@@ -89,26 +80,22 @@ bool udev_builtin_validate(struct udev *udev)
return false;
}
-void udev_builtin_list(struct udev *udev)
-{
+void udev_builtin_list(struct udev *udev) {
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
- fprintf(stderr, " %-12s %s\n", builtins[i]->name, builtins[i]->help);
+ fprintf(stderr, " %-14s %s\n", builtins[i]->name, builtins[i]->help);
}
-const char *udev_builtin_name(enum udev_builtin_cmd cmd)
-{
+const char *udev_builtin_name(enum udev_builtin_cmd cmd) {
return builtins[cmd]->name;
}
-bool udev_builtin_run_once(enum udev_builtin_cmd cmd)
-{
+bool udev_builtin_run_once(enum udev_builtin_cmd cmd) {
return builtins[cmd]->run_once;
}
-enum udev_builtin_cmd udev_builtin_lookup(const char *command)
-{
+enum udev_builtin_cmd udev_builtin_lookup(const char *command) {
char name[UTIL_PATH_SIZE];
enum udev_builtin_cmd i;
char *pos;
@@ -123,8 +110,7 @@ enum udev_builtin_cmd udev_builtin_lookup(const char *command)
return UDEV_BUILTIN_MAX;
}
-int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test)
-{
+int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) {
char arg[UTIL_PATH_SIZE];
int argc;
char *argv[128];
@@ -136,14 +122,8 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
return builtins[cmd]->cmd(dev, argc, argv, test);
}
-int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val)
-{
- struct udev_list_entry *entry;
-
- entry = udev_device_add_property(dev, key, val);
- /* store in db, skip private keys */
- if (key[0] != '.')
- udev_list_entry_set_num(entry, true);
+int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val) {
+ udev_device_add_property(dev, key, val);
if (test)
printf("%s=%s\n", key, val);