shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

virt-login-shell: allow shell to be a simple string argument

Browse Source 
Currently the shell config file parameter must be a list
giving the shell path and args. Allow it to be a plain
string argument as well.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-04-12 15:31:54 +01:00
parent 8a95d3df48
commit 730466081c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/virt-login-shell.c
View File

@ -121,6 +121,8 @@ static int virLoginShellGetShellArgv(virConfPtr conf,
goto error;
}
}
} else if (p->type == VIR_CONF_STRING) {
len = 1; /* /path/to/shell */
} else {
virReportSystemError(EINVAL, "%s",
_("shell must be a list of strings"));
@ -141,6 +143,9 @@ static int virLoginShellGetShellArgv(virConfPtr conf,
if (VIR_STRDUP(shargv[i++], pp->str) < 0)
goto error;
}
} else if (p->type == VIR_CONF_STRING) {
if (VIR_STRDUP(shargv[i++], p->str) < 0)
goto error;
}
shargv[i] = NULL;

12
tools/virt-login-shell.conf
View File

@ -5,11 +5,15 @@
# By default, virt-login-shell will connect you to a container running
# with the /bin/sh program. Modify the shell variable if you want your
# users to run a different shell or a setup container when joining a
# container. Shell commands must be a list of commands/options separated by
# comma and delimited by square brackets. Defaults to: /bin/sh -l.
# Modify and uncomment the following to modify the login shell.
# container.
#
# shell = [ "/bin/bash" ]
# This can either be just the path to a shell binary:
#
# shell = "/bin/bash"
#
# Or can be the path and extra arguments
#
# shell = [ "/bin/bash", "--posix" ]
#
# Note there is no need to pass a '--login' / '-l' argument since
# virt-login-shell will always request a login shell