chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: create a loopback btrfs file system for /var/lib/machines, if necessary
[elogind.git]
/
src
/
udev
/
udev-builtin.c
diff --git
a/src/udev/udev-builtin.c
b/src/udev/udev-builtin.c
index 57d75a13e45bf082b5e3b49d60685a6cf8c40512..d2aec1b200b7d41fed9c428c50064f8bfd346e7c 100644
(file)
--- a/
src/udev/udev-builtin.c
+++ b/
src/udev/udev-builtin.c
@@
-17,12
+17,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
#include <string.h>
#include <string.h>
-#include <errno.h>
#include <getopt.h>
#include "udev.h"
#include <getopt.h>
#include "udev.h"
@@
-34,13
+30,14
@@
static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
- [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
+ [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
#ifdef HAVE_KMOD
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
#endif
[UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
#ifdef HAVE_KMOD
[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
[UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
[UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
#ifdef HAVE_ACL
@@
-48,8
+45,7
@@
static const struct udev_builtin *builtins[] = {
#endif
};
#endif
};
-void udev_builtin_init(struct udev *udev)
-{
+void udev_builtin_init(struct udev *udev) {
unsigned int i;
if (initialized)
unsigned int i;
if (initialized)
@@
-62,8
+58,7
@@
void udev_builtin_init(struct udev *udev)
initialized = true;
}
initialized = true;
}
-void udev_builtin_exit(struct udev *udev)
-{
+void udev_builtin_exit(struct udev *udev) {
unsigned int i;
if (!initialized)
unsigned int i;
if (!initialized)
@@
-76,8
+71,7
@@
void udev_builtin_exit(struct udev *udev)
initialized = false;
}
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++)
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
@@
-86,26
+80,22
@@
bool udev_builtin_validate(struct udev *udev)
return false;
}
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++)
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
- fprintf(stderr, " %-1
2s
%s\n", builtins[i]->name, builtins[i]->help);
+ fprintf(stderr, " %-1
4s
%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;
}
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;
}
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;
char name[UTIL_PATH_SIZE];
enum udev_builtin_cmd i;
char *pos;
@@
-120,8
+110,7
@@
enum udev_builtin_cmd udev_builtin_lookup(const char *command)
return UDEV_BUILTIN_MAX;
}
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];
char arg[UTIL_PATH_SIZE];
int argc;
char *argv[128];
@@
-133,8
+122,7
@@
int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
return builtins[cmd]->cmd(dev, argc, argv, test);
}
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)
-{
+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);
struct udev_list_entry *entry;
entry = udev_device_add_property(dev, key, val);