chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: builtin - rename net_link to net_setup_link
[elogind.git]
/
src
/
udev
/
udev.h
diff --git
a/src/udev/udev.h
b/src/udev/udev.h
index c9408f2d463a8f24c21c97ef0b923a14c912e7df..46235b13a7bf1034c9f4914a05160206a8c75d21 100644
(file)
--- a/
src/udev/udev.h
+++ b/
src/udev/udev.h
@@
-39,6
+39,7
@@
struct udev_event {
mode_t mode;
uid_t uid;
gid_t gid;
mode_t mode;
uid_t uid;
gid_t gid;
+ struct udev_list seclabel_list;
struct udev_list run_list;
int exec_delay;
usec_t birth_usec;
struct udev_list run_list;
int exec_delay;
usec_t birth_usec;
@@
-72,7
+73,7
@@
struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
struct udev_rules *udev_rules_unref(struct udev_rules *rules);
bool udev_rules_check_timestamp(struct udev_rules *rules);
int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask);
struct udev_rules *udev_rules_unref(struct udev_rules *rules);
bool udev_rules_check_timestamp(struct udev_rules *rules);
int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask);
-
void
udev_rules_apply_static_dev_perms(struct udev_rules *rules);
+
int
udev_rules_apply_static_dev_perms(struct udev_rules *rules);
/* udev-event.c */
struct udev_event *udev_event_new(struct udev_device *dev);
/* udev-event.c */
struct udev_event *udev_event_new(struct udev_device *dev);
@@
-95,7
+96,9
@@
void udev_watch_end(struct udev *udev, struct udev_device *dev);
struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
/* udev-node.c */
struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
/* udev-node.c */
-void udev_node_add(struct udev_device *dev, bool apply, mode_t mode, uid_t uid, gid_t gid);
+void udev_node_add(struct udev_device *dev, bool apply,
+ mode_t mode, uid_t uid, gid_t gid,
+ struct udev_list *seclabel_list);
void udev_node_remove(struct udev_device *dev);
void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
void udev_node_remove(struct udev_device *dev);
void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
@@
-150,6
+153,7
@@
enum udev_builtin_cmd {
UDEV_BUILTIN_KMOD,
#endif
UDEV_BUILTIN_NET_ID,
UDEV_BUILTIN_KMOD,
#endif
UDEV_BUILTIN_NET_ID,
+ UDEV_BUILTIN_NET_LINK,
UDEV_BUILTIN_PATH_ID,
UDEV_BUILTIN_USB_ID,
#ifdef HAVE_ACL
UDEV_BUILTIN_PATH_ID,
UDEV_BUILTIN_USB_ID,
#ifdef HAVE_ACL
@@
-180,6
+184,7
@@
extern const struct udev_builtin udev_builtin_keyboard;
extern const struct udev_builtin udev_builtin_kmod;
#endif
extern const struct udev_builtin udev_builtin_net_id;
extern const struct udev_builtin udev_builtin_kmod;
#endif
extern const struct udev_builtin udev_builtin_net_id;
+extern const struct udev_builtin udev_builtin_net_setup_link;
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_uaccess;
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_uaccess;
@@
-198,7
+203,7
@@
int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, const
/* udev logging */
void udev_main_log(struct udev *udev, int priority,
const char *file, int line, const char *fn,
/* udev logging */
void udev_main_log(struct udev *udev, int priority,
const char *file, int line, const char *fn,
- const char *format, va_list args) _printf_
attr_
(6, 0);
+ const char *format, va_list args) _printf_(6, 0);
/* udevadm commands */
struct udevadm_cmd {
/* udevadm commands */
struct udevadm_cmd {