picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nspawn: add --version

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-01-11 16:03:49 -05:00
parent 6a17986542
commit acbeb42770
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
man/systemd-nspawn.xml
View File

@ -138,6 +138,13 @@
text and exits.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--version</option></term>
<listitem><para>Prints a version string
and exits.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--directory=</option></term>
<term><option>-D</option></term>

11
src/nspawn/nspawn.c
View File

@ -56,6 +56,7 @@
#include "sd-id128.h"
#include "dev-setup.h"
#include "fdset.h"
#include "build.h"
typedef enum LinkJournal {
LINK_NO,
@ -102,6 +103,7 @@ static int help(void) {
printf("%s [OPTIONS...] [PATH] [ARGUMENTS...]\n\n"
"Spawn a minimal namespace container for debugging, testing and building.\n\n"
" -h --help Show this help\n"
" --version Print version string\n"
" -D --directory=NAME Root directory for the container\n"
" -b --boot Boot up full system (i.e. invoke init)\n"
" -u --user=USER Run the command under specified user or uid\n"
@ -120,7 +122,8 @@ static int help(void) {
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_PRIVATE_NETWORK = 0x100,
ARG_VERSION = 0x100,
ARG_PRIVATE_NETWORK,
ARG_UUID,
ARG_READ_ONLY,
ARG_CAPABILITY,
@ -129,6 +132,7 @@ static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "directory", required_argument, NULL, 'D' },
{ "user", required_argument, NULL, 'u' },
{ "controllers", required_argument, NULL, 'C' },
@ -154,6 +158,11 @@ static int parse_argv(int argc, char *argv[]) {
help();
return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
puts(SYSTEMD_FEATURES);
return 0;
case 'D':
free(arg_directory);
arg_directory = canonicalize_file_name(optarg);