woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79 from jvvv/master

Browse Source 
Update docs for options changes
This commit is contained in:
robertswiecki 2018-06-02 20:17:03 +02:00 committed by GitHub
commit 0677f160f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -490,6 +490,8 @@ Options:
Which pre-existing cpu cgroup to use as a parent (default: 'NSJAIL') Which pre-existing cpu cgroup to use as a parent (default: 'NSJAIL')
--iface_no_lo --iface_no_lo
Don't bring up the 'lo' interface Don't bring up the 'lo' interface
--iface_own VALUE
Move this existing network interface into the new NET namespace. Can be specified multiple times
--macvlan_iface|-I VALUE --macvlan_iface|-I VALUE
Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs' Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs'
--macvlan_vs_ip VALUE --macvlan_vs_ip VALUE
@ -499,20 +501,6 @@ Options:
--macvlan_vs_gw VALUE --macvlan_vs_gw VALUE
Default GW for the 'vs' interface (e.g. "192.168.0.1") Default GW for the 'vs' interface (e.g. "192.168.0.1")
Deprecated options:
--iface|-I VALUE
Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs'
DEPRECATED: Use macvlan_iface instead.
--iface_vs_ip VALUE
IP of the 'vs' interface (e.g. "192.168.0.1")
DEPRECATED: Use macvlan_vs_ip instead.
--iface_vs_nm VALUE
Netmask of the 'vs' interface (e.g. "255.255.255.0")
DEPRECATED: Use macvlan_vs_nm instead.
--iface_vs_gw VALUE
Default GW for the 'vs' interface (e.g. "192.168.0.1")
DEPRECATED: Use macvlan_vs_gw instead.
Examples: Examples:
Wait on a port 31337 for connections, and run /bin/sh Wait on a port 31337 for connections, and run /bin/sh
nsjail -Ml --port 31337 --chroot / -- /bin/sh -i nsjail -Ml --port 31337 --chroot / -- /bin/sh -i

20
nsjail.1
View File

@ -247,6 +247,9 @@ Which pre-existing cpu cgroup to use as a parent (default: 'NSJAIL')
\fB\-\-iface_no_lo\fR \fB\-\-iface_no_lo\fR
Don't bring up the 'lo' interface Don't bring up the 'lo' interface
.TP .TP
\fB\-\-iface_own\fR VALUE
Move this existing network interface into the new NET namespace. Can be specified multiple times
.TP
\fB\-\-macvlan_iface\fR|\fB\-I\fR VALUE \fB\-\-macvlan_iface\fR|\fB\-I\fR VALUE
Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs' Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs'
.TP .TP
@ -259,23 +262,6 @@ Netmask of the 'vs' interface (e.g. "255.255.255.0")
\fB\-\-macvlan_vs_gw\fR VALUE \fB\-\-macvlan_vs_gw\fR VALUE
Default GW for the 'vs' interface (e.g. "192.168.0.1") Default GW for the 'vs' interface (e.g. "192.168.0.1")
\" \"
.SH Deprecated options
.TP
\fB\-\-iface\fR|\fB\-I\fR VALUE
Interface which will be cloned (MACVLAN) and put inside the subprocess' namespace as 'vs'
DEPRECATED: Use macvlan_iface instead.
.TP
\fB\-\-iface_vs_ip\fR VALUE
IP of the 'vs' interface (e.g. "192.168.0.1")
DEPRECATED: Use macvlan_vs_ip instead.
.TP
\fB\-\-iface_vs_nm\fR VALUE
Netmask of the 'vs' interface (e.g. "255.255.255.0")
DEPRECATED: Use macvlan_vs_nm instead.
\fB\-\-iface_vs_gw\fR VALUE
Default GW for the 'vs' interface (e.g. "192.168.0.1")
DEPRECATED: Use macvlan_vs_gw instead.
\"
.SH Examples .SH Examples
.PP .PP
Wait on a port 31337 for connections, and run /bin/sh: Wait on a port 31337 for connections, and run /bin/sh: