From efe3877e3c657922724d7e192b0d74a018302d69 Mon Sep 17 00:00:00 2001 From: Vitaliy Ivanov Date: Mon, 15 Jul 2013 13:08:03 +0300 Subject: [PATCH 1/3] Fixed mininet.org url in README.md. s/http:\/\/openflow.org\/mininet/http:\/\/mininet.org/g --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf0e8b8..724d5fa 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ See `INSTALL` for installation instructions and details. In addition to the API documentation (`make doc`), much useful information, including a Mininet walkthrough and an introduction 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 contribute to, particularly the Frequently Asked Questions (FAQ.) From 36bf8ac911559522fd805b10fd48b7d10f541f3a Mon Sep 17 00:00:00 2001 From: Vitaliy Ivanov Date: Mon, 15 Jul 2013 13:12:52 +0300 Subject: [PATCH 2/3] mnexec.c: substituting tabs with spaces. --- mnexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mnexec.c b/mnexec.c index bd7b1b1..b1b2745 100644 --- a/mnexec.c +++ b/mnexec.c @@ -46,7 +46,7 @@ void usage(char *name) int setns(int fd, int nstype) { - return syscall(__NR_setns, fd, nstype); + return syscall(__NR_setns, fd, nstype); } /* Validate alphanumeric path foo1/bar2/baz */ @@ -112,9 +112,9 @@ int main(int argc, char *argv[]) case -1: perror("fork"); return 1; - case 0: /* child */ + case 0: /* child */ break; - default: /* parent */ + default: /* parent */ return 0; } } From 5b609ef9e2c89ec96d674cf152df5fb5074bdbb9 Mon Sep 17 00:00:00 2001 From: Vitaliy Ivanov Date: Mon, 15 Jul 2013 14:20:16 +0200 Subject: [PATCH 3/3] Adding mininet doxygen installation dependencies. Right now after installing mininet using util/install.sh there is a problem when try to generate doc: make doc doxygen doc/doxygen.cfg make: doxygen: Command not found make: *** [doc] Error 127 Adding doxygen, doxypy and texlive-fonts-recommended packages to fix the problem. --- util/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/util/install.sh b/util/install.sh index 424d0ac..ccea244 100755 --- a/util/install.sh +++ b/util/install.sh @@ -136,6 +136,7 @@ function mn_deps { echo "Installing Mininet dependencies" $install gcc make socat psmisc xterm ssh iperf iproute telnet \ python-setuptools cgroup-bin ethtool help2man \ + doxygen doxypy texlive-fonts-recommended \ pyflakes pylint pep8 # Add sysctl parameters as noted in the INSTALL file to increase kernel