Merge pull request #171 from vitalivanov/dev

Cleanup and cosmetic changes.
This commit is contained in:
Brian O'Connor
2013-07-19 16:07:15 -07:00
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -103,7 +103,7 @@ See `INSTALL` for installation instructions and details.
In addition to the API documentation (`make doc`), much useful In addition to the API documentation (`make doc`), much useful
information, including a Mininet walkthrough and an introduction information, including a Mininet walkthrough and an introduction
to the Python API, is available on the to the Python API, is available on the
[Mininet Web Site](http://openflow.org/mininet). [Mininet Web Site](http://mininet.org).
There is also a wiki which you are encouraged to read and to There is also a wiki which you are encouraged to read and to
contribute to, particularly the Frequently Asked Questions (FAQ.) contribute to, particularly the Frequently Asked Questions (FAQ.)
+3 -3
View File
@@ -46,7 +46,7 @@ void usage(char *name)
int setns(int fd, int nstype) int setns(int fd, int nstype)
{ {
return syscall(__NR_setns, fd, nstype); return syscall(__NR_setns, fd, nstype);
} }
/* Validate alphanumeric path foo1/bar2/baz */ /* Validate alphanumeric path foo1/bar2/baz */
@@ -112,9 +112,9 @@ int main(int argc, char *argv[])
case -1: case -1:
perror("fork"); perror("fork");
return 1; return 1;
case 0: /* child */ case 0: /* child */
break; break;
default: /* parent */ default: /* parent */
return 0; return 0;
} }
} }
+1
View File
@@ -136,6 +136,7 @@ function mn_deps {
echo "Installing Mininet dependencies" echo "Installing Mininet dependencies"
$install gcc make socat psmisc xterm ssh iperf iproute telnet \ $install gcc make socat psmisc xterm ssh iperf iproute telnet \
python-setuptools cgroup-bin ethtool help2man \ python-setuptools cgroup-bin ethtool help2man \
doxygen doxypy texlive-fonts-recommended \
pyflakes pylint pep8 pyflakes pylint pep8
# Add sysctl parameters as noted in the INSTALL file to increase kernel # Add sysctl parameters as noted in the INSTALL file to increase kernel