diff options
| author | jamie <jamie@FreeBSD.org> | 2012-05-28 20:44:11 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2012-05-28 20:44:11 +0000 |
| commit | 5ddbe53eac495d89b4eb26531ed3c615434c0146 (patch) | |
| tree | 9644e66b9e28b973607e196f0d998bbf8bd6cb54 /usr.sbin/jail/jail.c | |
| parent | a2b635f68fcf94cb460352c043cab224b7e0123f (diff) | |
| download | FreeBSD-src-5ddbe53eac495d89b4eb26531ed3c615434c0146.zip FreeBSD-src-5ddbe53eac495d89b4eb26531ed3c615434c0146.tar.gz | |
When writing the jid via the -i flag, do it right when the jail is created,
before any commands run. /etc/rc.d/jail depends on this.
Diffstat (limited to 'usr.sbin/jail/jail.c')
| -rw-r--r-- | usr.sbin/jail/jail.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index e827e11..4fc03c9 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -55,6 +55,7 @@ struct permspec { }; const char *cfname; +int iflag; int note_remove; int verbose; @@ -129,7 +130,7 @@ main(int argc, char **argv) size_t sysvallen; unsigned op, pi; int ch, docf, error, i, oldcl, sysval; - int dflag, iflag, Rflag; + int dflag, Rflag; char enforce_statfs[4]; #if defined(INET) || defined(INET6) char *cs, *ncs; @@ -139,7 +140,7 @@ main(int argc, char **argv) #endif op = 0; - dflag = iflag = Rflag = 0; + dflag = Rflag = 0; docf = 1; cfname = CONF_FILE; JidFile = NULL; @@ -415,8 +416,6 @@ main(int argc, char **argv) continue; jail_create_done: clear_persist(j); - if (iflag) - printf("%d\n", j->jid); if (jfp != NULL) print_jail(jfp, j, oldcl); dep_done(j, 0); |
