mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
busctl: add a new --watch-bind switch
This is useful for testing, and early-boot scripting.
This commit is contained in:
parent
ac8029fc25
commit
56d820b6a4
|
@ -241,6 +241,16 @@
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><option>--watch-bind=</option><replaceable>BOOL</replaceable></term>
|
||||||
|
|
||||||
|
<listitem>
|
||||||
|
<para>Controls whether to wait for the specified <constant>AF_UNIX</constant> bus socket to appear in the
|
||||||
|
file system before connecting to it. Defaults to off. When enabled, the tool will watch the file system until
|
||||||
|
the socket is created and then connect to it.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<xi:include href="user-system-options.xml" xpointer="user" />
|
<xi:include href="user-system-options.xml" xpointer="user" />
|
||||||
<xi:include href="user-system-options.xml" xpointer="system" />
|
<xi:include href="user-system-options.xml" xpointer="system" />
|
||||||
<xi:include href="user-system-options.xml" xpointer="host" />
|
<xi:include href="user-system-options.xml" xpointer="host" />
|
||||||
|
|
|
@ -62,6 +62,7 @@ static bool arg_expect_reply = true;
|
||||||
static bool arg_auto_start = true;
|
static bool arg_auto_start = true;
|
||||||
static bool arg_allow_interactive_authorization = true;
|
static bool arg_allow_interactive_authorization = true;
|
||||||
static bool arg_augment_creds = true;
|
static bool arg_augment_creds = true;
|
||||||
|
static bool arg_watch_bind = false;
|
||||||
static usec_t arg_timeout = 0;
|
static usec_t arg_timeout = 0;
|
||||||
|
|
||||||
#define NAME_IS_ACQUIRED INT_TO_PTR(1)
|
#define NAME_IS_ACQUIRED INT_TO_PTR(1)
|
||||||
|
@ -1735,7 +1736,9 @@ static int help(void) {
|
||||||
" --allow-interactive-authorization=BOOL\n"
|
" --allow-interactive-authorization=BOOL\n"
|
||||||
" Allow interactive authorization for operation\n"
|
" Allow interactive authorization for operation\n"
|
||||||
" --timeout=SECS Maximum time to wait for method call completion\n"
|
" --timeout=SECS Maximum time to wait for method call completion\n"
|
||||||
" --augment-creds=BOOL Extend credential data with data read from /proc/$PID\n\n"
|
" --augment-creds=BOOL Extend credential data with data read from /proc/$PID\n"
|
||||||
|
" --watch-bind=BOOL Wait for bus AF_UNIX socket to be bound in the file\n"
|
||||||
|
" system\n\n"
|
||||||
"Commands:\n"
|
"Commands:\n"
|
||||||
" list List bus names\n"
|
" list List bus names\n"
|
||||||
" status [SERVICE] Show bus service, process or bus owner credentials\n"
|
" status [SERVICE] Show bus service, process or bus owner credentials\n"
|
||||||
|
@ -1777,6 +1780,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||||
ARG_ALLOW_INTERACTIVE_AUTHORIZATION,
|
ARG_ALLOW_INTERACTIVE_AUTHORIZATION,
|
||||||
ARG_TIMEOUT,
|
ARG_TIMEOUT,
|
||||||
ARG_AUGMENT_CREDS,
|
ARG_AUGMENT_CREDS,
|
||||||
|
ARG_WATCH_BIND,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct option options[] = {
|
static const struct option options[] = {
|
||||||
|
@ -1803,6 +1807,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||||
{ "allow-interactive-authorization", required_argument, NULL, ARG_ALLOW_INTERACTIVE_AUTHORIZATION },
|
{ "allow-interactive-authorization", required_argument, NULL, ARG_ALLOW_INTERACTIVE_AUTHORIZATION },
|
||||||
{ "timeout", required_argument, NULL, ARG_TIMEOUT },
|
{ "timeout", required_argument, NULL, ARG_TIMEOUT },
|
||||||
{ "augment-creds",required_argument, NULL, ARG_AUGMENT_CREDS},
|
{ "augment-creds",required_argument, NULL, ARG_AUGMENT_CREDS},
|
||||||
|
{ "watch-bind", required_argument, NULL, ARG_WATCH_BIND },
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1953,6 +1958,16 @@ static int parse_argv(int argc, char *argv[]) {
|
||||||
arg_augment_creds = !!r;
|
arg_augment_creds = !!r;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ARG_WATCH_BIND:
|
||||||
|
r = parse_boolean(optarg);
|
||||||
|
if (r < 0) {
|
||||||
|
log_error("Failed to parse --watch-bind= parameter.");
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
arg_watch_bind = !!r;
|
||||||
|
break;
|
||||||
|
|
||||||
case '?':
|
case '?':
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -2051,6 +2066,12 @@ int main(int argc, char *argv[]) {
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r = sd_bus_set_watch_bind(bus, arg_watch_bind);
|
||||||
|
if (r < 0) {
|
||||||
|
log_error_errno(r, "Failed to set watch-bind setting to '%s': %m", yes_no(arg_watch_bind));
|
||||||
|
goto finish;
|
||||||
|
}
|
||||||
|
|
||||||
if (arg_address)
|
if (arg_address)
|
||||||
r = sd_bus_set_address(bus, arg_address);
|
r = sd_bus_set_address(bus, arg_address);
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in a new issue