It is documented that a command to run inside the container can be
passed with the -c arg.
virt-login-shell -c "ls -l /"
This fixes
commit 4feeb2d986b98013ebfb1d41ab6b9007b6cce6e2
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Thu Aug 1 10:58:31 2019 +0100
tools: split virt-login-shell into two binaries
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
tools/virt-login-shell.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c
index f92cc0a749..7d1e0ccc8a 100644
--- a/tools/virt-login-shell.c
+++ b/tools/virt-login-shell.c
@@ -38,12 +38,8 @@
int main(int argc, char **argv) {
char uidstr[INT_BUFSIZE_BOUND(uid_t)];
char gidstr[INT_BUFSIZE_BOUND(gid_t)];
- const char *const newargv[] = {
- LIBEXECDIR "/virt-login-shell-helper",
- uidstr,
- gidstr,
- NULL,
- };
+ const char * newargv[6];
+ size_t nargs = 0;
char *newenv[] = {
NULL,
NULL,
@@ -60,10 +56,23 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
- if (argc != 1) {
- fprintf(stderr, "%s: no arguments expected\n", argv[0]);
+ newargv[nargs++] = LIBEXECDIR "/virt-login-shell-helper";
+ if (argc == 3) {
+ if (strcmp(argv[1], "-c") != 0) {
+ fprintf(stderr, "%s: syntax: %s [-c CMDSTR]\n", argv[0], argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ newargv[nargs++] = argv[1];
+ newargv[nargs++] = argv[2];
+ } else if (argc != 1) {
+ fprintf(stderr, "%s: syntax: %s [-c CMDSTR]\n", argv[0], argv[0]);
exit(EXIT_FAILURE);
}
+ newargv[nargs++] = uidstr;
+ newargv[nargs++] = gidstr;
+ newargv[nargs++] = NULL;
+
+ assert(nargs <= (sizeof(newargv)/sizeof(newargv[0])));
if (term &&
asprintf(&(newenv[0]), "TERM=%s", term) < 0) {
--
2.21.0
Show replies by date
On 9/27/19 7:13 PM, Daniel P. Berrangé wrote:
It is documented that a command to run inside the container can be
passed with the -c arg.
virt-login-shell -c "ls -l /"
This fixes
commit 4feeb2d986b98013ebfb1d41ab6b9007b6cce6e2
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Thu Aug 1 10:58:31 2019 +0100
tools: split virt-login-shell into two binaries
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
tools/virt-login-shell.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
Oops, Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal