summaryrefslogtreecommitdiff
path: root/udev
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-25 17:58:30 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-25 17:58:30 +0100
commit57f4ef67aa4e517e4ee1b79360169f5544f72379 (patch)
tree15ba77fa3c21e4f1b195c25361d93553081a6a87 /udev
parentd1c13ddcb3497e0c6a37cd9bd117b74ef010bc15 (diff)
builtin: firmware - move 'firmware' tool to builtins
Diffstat (limited to 'udev')
-rw-r--r--udev/udev-builtin-kmod.c2
-rw-r--r--udev/udev-builtin.c7
-rw-r--r--udev/udev.h14
3 files changed, 13 insertions, 10 deletions
diff --git a/udev/udev-builtin-kmod.c b/udev/udev-builtin-kmod.c
index 6f3e2589c2..e6c4d95109 100644
--- a/udev/udev-builtin-kmod.c
+++ b/udev/udev-builtin-kmod.c
@@ -336,7 +336,7 @@ static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te
}
for (i = 2; argv[i]; i++) {
- info(udev, "%s '%s'\n", argv[1], argv[i]);
+ info(udev, "execute '%s' '%s'\n", argv[1], argv[i]);
insmod(ctx, argv[i], NULL);
}
diff --git a/udev/udev-builtin.c b/udev/udev-builtin.c
index baf09b91b9..cf62d57e23 100644
--- a/udev/udev-builtin.c
+++ b/udev/udev-builtin.c
@@ -26,11 +26,12 @@
#include "udev.h"
static const struct udev_builtin *builtins[] = {
- [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
- [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
- [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+ [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+ [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
+ [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
+ [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
};
int udev_builtin_init(struct udev *udev)
diff --git a/udev/udev.h b/udev/udev.h
index 7bd2228a6b..3327031e87 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -148,11 +148,12 @@ extern const struct udevadm_cmd udevadm_test_builtin;
/* built-in commands */
enum udev_builtin_cmd {
- UDEV_BUILTIN_PATH_ID,
- UDEV_BUILTIN_USB_ID,
- UDEV_BUILTIN_INPUT_ID,
UDEV_BUILTIN_BLKID,
+ UDEV_BUILTIN_FIRMWARE,
+ UDEV_BUILTIN_INPUT_ID,
UDEV_BUILTIN_KMOD,
+ UDEV_BUILTIN_PATH_ID,
+ UDEV_BUILTIN_USB_ID,
UDEV_BUILTIN_MAX
};
struct udev_builtin {
@@ -163,11 +164,12 @@ struct udev_builtin {
int (*exit)(struct udev *udev);
bool run_once;
};
-extern const struct udev_builtin udev_builtin_path_id;
-extern const struct udev_builtin udev_builtin_usb_id;
-extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_blkid;
+extern const struct udev_builtin udev_builtin_firmware;
+extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_kmod;
+extern const struct udev_builtin udev_builtin_path_id;
+extern const struct udev_builtin udev_builtin_usb_id;
int udev_builtin_load(struct udev *udev);
int udev_builtin_unload(struct udev *udev);
enum udev_builtin_cmd udev_builtin_lookup(const char *command);