summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-10-28 20:20:59 +0100
committerTom Gundersen <teg@jklm.no>2013-10-29 14:17:57 +0100
commit0b99c9f8f0cbfe9ab3de443cb6f94ecd7d21eae3 (patch)
tree164c8679e1b4953681fc0e4cd189df38e1173455
parent9dc670ea766c711741f462b29572f2e5f8f3f6bc (diff)
udev: builtin - rename net_link to net_setup_link
Also add shell completions.
-rw-r--r--Makefile.am2
-rw-r--r--rules/85-net-configure-link.rules8
-rw-r--r--shell-completion/bash/udevadm2
-rw-r--r--shell-completion/zsh/_udevadm2
-rw-r--r--src/udev/udev-builtin-net_setup_link.c (renamed from src/udev/udev-builtin-net_link.c)20
-rw-r--r--src/udev/udev-builtin.c2
-rw-r--r--src/udev/udev.h2
7 files changed, 19 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index bf5459a7b8..2f6ba211d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2312,7 +2312,7 @@ libudev_core_la_SOURCES = \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
- src/udev/udev-builtin-net_link.c \
+ src/udev/udev-builtin-net_setup_link.c \
src/udev/udev-builtin-path_id.c \
src/udev/udev-builtin-usb_id.c \
src/udev/net/link-config.h \
diff --git a/rules/85-net-configure-link.rules b/rules/85-net-configure-link.rules
index 29d689325d..d0ecb93058 100644
--- a/rules/85-net-configure-link.rules
+++ b/rules/85-net-configure-link.rules
@@ -1,11 +1,11 @@
# do not edit this file, it will be overwritten on update
-SUBSYSTEM!="net", GOTO="net_link_end"
+SUBSYSTEM!="net", GOTO="net_setup_link_end"
IMPORT{builtin}="path_id"
-ACTION!="add", GOTO="net_link_end"
+ACTION!="add", GOTO="net_setup_link_end"
-RUN{builtin}="net_link"
+RUN{builtin}="net_setup_link"
-LABEL="net_link_end"
+LABEL="net_setup_link_end"
diff --git a/shell-completion/bash/udevadm b/shell-completion/bash/udevadm
index 8ad855060c..d58cdf532d 100644
--- a/shell-completion/bash/udevadm
+++ b/shell-completion/bash/udevadm
@@ -83,7 +83,7 @@ _udevadm() {
fi
;;
'test-builtin')
- comps='blkid btrfs hwdb input_id keyboard kmod net_id path_id usb_id uaccess'
+ comps='blkid btrfs hwdb input_id keyboard kmod net_id net_setup_link path_id usb_id uaccess'
;;
*)
comps=${VERBS[*]}
diff --git a/shell-completion/zsh/_udevadm b/shell-completion/zsh/_udevadm
index 04e9f8dd8e..e5d252c818 100644
--- a/shell-completion/zsh/_udevadm
+++ b/shell-completion/zsh/_udevadm
@@ -75,7 +75,7 @@ _udevadm_test-builtin(){
if (( CURRENT == 2 )); then
_arguments \
'--help[Print help text]' \
- '*::builtins:(blkid btrfs hwdb input_id kmod path_id usb_id uaccess)'
+ '*::builtins:(blkid btrfs hwdb input_id net_id net_setup_link kmod path_id usb_id uaccess)'
elif (( CURRENT == 3 )); then
_arguments \
'--help[Print help text]' \
diff --git a/src/udev/udev-builtin-net_link.c b/src/udev/udev-builtin-net_setup_link.c
index f4fb63ec51..739221ba2b 100644
--- a/src/udev/udev-builtin-net_link.c
+++ b/src/udev/udev-builtin-net_setup_link.c
@@ -25,7 +25,7 @@
link_config_ctx *ctx;
-static int builtin_net_link(struct udev_device *dev, int argc, char **argv, bool test) {
+static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) {
link_config *link;
int r;
@@ -54,7 +54,7 @@ static int builtin_net_link(struct udev_device *dev, int argc, char **argv, bool
return EXIT_SUCCESS;
}
-static int builtin_net_link_init(struct udev *udev) {
+static int builtin_net_setup_link_init(struct udev *udev) {
int r;
if (ctx)
@@ -72,12 +72,12 @@ static int builtin_net_link_init(struct udev *udev) {
return 0;
}
-static void builtin_net_link_exit(struct udev *udev) {
+static void builtin_net_setup_link_exit(struct udev *udev) {
link_config_ctx_free(ctx);
log_debug("Unloaded link configuration context");
}
-static bool builtin_net_link_validate(struct udev *udev) {
+static bool builtin_net_setup_link_validate(struct udev *udev) {
log_debug("Check if link configuration needs reloading");
if (!ctx)
return false;
@@ -85,12 +85,12 @@ static bool builtin_net_link_validate(struct udev *udev) {
return link_config_should_reload(ctx);
}
-const struct udev_builtin udev_builtin_net_link = {
- .name = "net_link",
- .cmd = builtin_net_link,
- .init = builtin_net_link_init,
- .exit = builtin_net_link_exit,
- .validate = builtin_net_link_validate,
+const struct udev_builtin udev_builtin_net_setup_link = {
+ .name = "net_setup_link",
+ .cmd = builtin_net_setup_link,
+ .init = builtin_net_setup_link_init,
+ .exit = builtin_net_setup_link_exit,
+ .validate = builtin_net_setup_link_validate,
.help = "configure network link",
.run_once = false,
};
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 85901e8ee3..fd373d04dc 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -44,7 +44,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_link,
+ [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
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 7cca8b8c83..46235b13a7 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -184,7 +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_net_link;
+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;