diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-07 02:53:35 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-07 02:53:35 +0200 |
| commit | 5654503680ac8381e2acbf9f6c91512ccd47f950 (patch) | |
| tree | abb699cc3bfd50e53be8ce280b9b04ad00f3e11e | |
| parent | 0254b2118f123504c268edb0b382c587ac15aaa3 (diff) | |
udevadm: control - --env -> --property
| -rw-r--r-- | udev/udevadm-control.c | 9 | ||||
| -rw-r--r-- | udev/udevadm.xml | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c index 50020b57d9..3fe41977c5 100644 --- a/udev/udevadm-control.c +++ b/udev/udevadm-control.c @@ -34,7 +34,7 @@ static void print_help(void) " --stop-exec-queue keep udevd from executing events, queue only\n" " --start-exec-queue execute events, flush queue\n" " --reload-rules reloads the rules files\n" - " --env=<KEY>=<value> set a global environment variable\n" + " --property=<KEY>=<value> set a global property for all events\n" " --max-childs=<N> maximum number of childs\n" " --help print this help text\n\n"); } @@ -54,7 +54,8 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) { "start_exec_queue", no_argument, NULL, 'S' + 256}, { "reload-rules", no_argument, NULL, 'R' }, { "reload_rules", no_argument, NULL, 'R' + 256}, - { "env", required_argument, NULL, 'e' }, + { "property", required_argument, NULL, 'p' }, + { "env", required_argument, NULL, 'p' }, { "max-childs", required_argument, NULL, 'm' }, { "max_childs", required_argument, NULL, 'm' + 256}, { "help", no_argument, NULL, 'h' }, @@ -75,7 +76,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) int i; char *endp; - option = getopt_long(argc, argv, "l:sSRe:m:M:h", options, NULL); + option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL); if (option == -1) break; @@ -112,7 +113,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[]) udev_ctrl_send_reload_rules(uctrl); rc = 0; break; - case 'e': + case 'p': if (strchr(optarg, '=') == NULL) { fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg); goto exit; diff --git a/udev/udevadm.xml b/udev/udevadm.xml index 093dd21428..4377b20d27 100644 --- a/udev/udevadm.xml +++ b/udev/udevadm.xml @@ -298,9 +298,9 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--env=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term> + <term><option>--property=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term> <listitem> - <para>Set global variable.</para> + <para>Set a global property for all events.</para> </listitem> </varlistentry> <varlistentry> |