diff options
| author | hrs <hrs@FreeBSD.org> | 2013-10-12 17:27:59 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-10-12 17:27:59 +0000 |
| commit | 513bdd96d7234f6f561d60a5f7956c040564278b (patch) | |
| tree | c88d47582a2804e0373cda069d84ca00c63163e5 /etc/rc.d | |
| parent | 9c2f444a0a1ff0a6f894c4245c1265534eb7a9cd (diff) | |
| download | FreeBSD-src-513bdd96d7234f6f561d60a5f7956c040564278b.zip FreeBSD-src-513bdd96d7234f6f561d60a5f7956c040564278b.tar.gz | |
- Add mount.fdescfs parameter to jail(8). This is similar to
mount.devfs but mounts fdescfs. The mount happens just after
mount.devfs.
- rc.d/jail now displays whole error message from jail(8) when a jail
fails to start.
Approved by: re (gjb)
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/jail | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 63e489a..c935fac 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -226,8 +226,7 @@ parse_options() eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}} if checkyesno jail_${_j}_fdescfs_enable; then - echo " mount += " \ - "\"fdescfs ${_rootdir%/}/dev/fd fdescfs rw 0 0\";" + echo " mount.fdescfs;" fi eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}} if checkyesno jail_${_j}_procfs_enable; then @@ -438,7 +437,7 @@ jail_start() echo -n " ${_hostname:-${_jail}}" else echo " cannot start jail \"${_hostname:-${jail}}\": " - tail +2 $_tmp + cat $_tmp fi rm -f $_tmp done |
