Author: zec
Date: Fri Aug 21 11:17:25 2009
New Revision: 196422
URL: http://svn.freebsd.org/changeset/base/196422
Log:
MFC r196421:
Bugfix: all requests for creating vnets via vimage -c were always
reported as failures, even if the actual library / system call
would succeed, because error message would be reported if the return
value from jail_setv() call was >= 0, and if not, then if that same
value was < 0, i.e. always. The correct behavior is to abort (only)
if jail_setv() returns < 0.
Approved by: re (rwatson), julian (mentor)
Approved by: re (rwatson)
Modified:
stable/8/tools/tools/vimage/ (props changed)
stable/8/tools/tools/vimage/vimage.c
Modified: stable/8/tools/tools/vimage/vimage.c
==============================================================================
--- stable/8/tools/tools/vimage/vimage.c Fri Aug 21 11:13:56 2009
(r196421)
+++ stable/8/tools/tools/vimage/vimage.c Fri Aug 21 11:17:25 2009
(r196422)
@@ -252,7 +252,7 @@ main(int argc, char **argv)
exit(0);
case VI_CREATE:
- if ((jid = jail_setv(JAIL_CREATE,
+ if (jail_setv(JAIL_CREATE,
"name", argv[0],
"vnet", NULL,
"host", NULL,
@@ -260,9 +260,7 @@ main(int argc, char **argv)
"allow.raw_sockets", "true",
"allow.socket_af", "true",
"allow.mount", "true",
- NULL)) >= 0)
- break;
- if (jid < 0)
+ NULL) < 0)
break;
if (argc == 1)
exit(0);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
