chiark / gitweb /
udev: builtin - rename net_link to net_setup_link
authorTom Gundersen <teg@jklm.no>
Mon, 28 Oct 2013 19:20:59 +0000 (20:20 +0100)
committerTom Gundersen <teg@jklm.no>
Tue, 29 Oct 2013 13:17:57 +0000 (14:17 +0100)
Also add shell completions.

Makefile.am
rules/85-net-configure-link.rules
shell-completion/bash/udevadm
shell-completion/zsh/_udevadm
src/udev/udev-builtin-net_setup_link.c [moved from src/udev/udev-builtin-net_link.c with 80% similarity]
src/udev/udev-builtin.c
src/udev/udev.h

index bf5459a..2f6ba21 100644 (file)
@@ -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 \
index 29d6893..d0ecb93 100644 (file)
@@ -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"
index 8ad8550..d58cdf5 100644 (file)
@@ -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[*]}
index 04e9f8d..e5d252c 100644 (file)
@@ -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]' \
similarity index 80%
rename from src/udev/udev-builtin-net_link.c
rename to src/udev/udev-builtin-net_setup_link.c
index f4fb63e..739221b 100644 (file)
@@ -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,
 };
index 85901e8..fd373d0 100644 (file)
@@ -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
index 7cca8b8..46235b1 100644 (file)
@@ -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;