28c28
< __FBSDID("$FreeBSD: projects/jailconf/usr.sbin/jail/command.c 231238 2012-02-08 23:51:46Z jamie $");
---
> __FBSDID("$FreeBSD: projects/jailconf/usr.sbin/jail/command.c 232242 2012-02-27 22:37:35Z jamie $");
419a420
> argv = alloca(7 * sizeof(char *));
431d431
< argv = alloca(3 * sizeof(char *));
436,446c436,446
< argv = alloca(4 * sizeof(char *));
< *(const char **)&argv[0] = _PATH_BSHELL;
< *(const char **)&argv[1] = "-c";
< ruleset = string_param(j->intparams
< [IP_MOUNT_DEVFS_RULESET]);
< argv[2] = alloca(strlen(path) +
< (ruleset ? strlen(ruleset) + 1 : 0) + 56);
< sprintf(argv[2], ". /etc/rc.subr; load_rc_config .; "
< "devfs_mount_jail %s/dev%s%s", path,
< ruleset ? " " : "", ruleset ? ruleset : "");
< argv[3] = NULL;
---
> *(const char **)&argv[0] = _PATH_MOUNT;
> *(const char **)&argv[1] = "-t";
> *(const char **)&argv[2] = "devfs";
> ruleset = string_param(j->intparams[KP_DEVFS_RULESET]);
> if (!ruleset)
> ruleset = "4"; /* devfsrules_jail */
> argv[3] = alloca(11 + strlen(ruleset));
> sprintf(argv[3], "-oruleset=%s", ruleset);
> *(const char **)&argv[4] = ".";
> argv[5] = devpath;
> argv[6] = NULL;