Support for --chroot ""

This commit is contained in:
Jagger 2016-03-02 02:30:30 +01:00
parent b89b8cfbc7
commit e35b345163

View File

@ -307,7 +307,7 @@ bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
"\te: Immediately launch a single process on a console using execve [MODE_STANDALONE_EXECVE]\n"
"\tr: Immediately launch a single process on a console, keep doing it forever [MODE_STANDALONE_RERUN]"},
{{"cmd", no_argument, NULL, 0x500}, "Equivalent of -Mo (MODE_STANDALONE_ONCE), run command on a local console, once"},
{{"chroot", required_argument, NULL, 'c'}, "Directory containing / of the jail (default: \"/\")"},
{{"chroot", required_argument, NULL, 'c'}, "Directory containing / of the jail (default: \"/\"). Skip mounting it if \"\""},
{{"rw", no_argument, NULL, 0x601}, "Mount / as RW (default: RO)"},
{{"user", required_argument, NULL, 'u'}, "Username/uid of processess inside the jail (default: your current uid). You can also use inside_ns_uid:outside_ns_uid convention here"},
{{"group", required_argument, NULL, 'g'}, "Groupname/gid of processess inside the jail (default: your current gid). You can also use inside_ns_gid:global_ns_gid convention here"},
@ -589,7 +589,7 @@ bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
p->fs_type = "proc";
TAILQ_INSERT_HEAD(&nsjconf->mountpts, p, pointers);
}
{
if (strcmp(nsjconf->chroot, "") != 0) {
struct mounts_t *p = utilMalloc(sizeof(struct mounts_t));
p->src = nsjconf->chroot;
p->dst = "/";