Cleaned up sysctl and rlimit test and set

Use files instead of sysctl to set limits
This commit is contained in:
Brian O'Connor
2013-08-14 15:04:11 -07:00
parent b20c9470c7
commit 867a6d6731
2 changed files with 28 additions and 50 deletions
+9 -8
View File
@@ -144,14 +144,15 @@ function mn_deps {
python-setuptools cgroup-bin ethtool help2man \
pyflakes pylint pep8
# Add sysctl parameters as noted in the INSTALL file to increase kernel
# limits to support larger setups:
if ! grep Mininet /etc/sysctl.conf; then
echo "Adding Mininet sysctl settings"
sudo su -c "cat $MININET_DIR/mininet/util/sysctl_addon >> /etc/sysctl.conf"
fi
# Load new sysctl settings:
sudo sysctl -p
# TODO: remove this; it's no longer necessary as these are check when mn starts
## Add sysctl parameters as noted in the INSTALL file to increase kernel
## limits to support larger setups:
#if ! grep Mininet /etc/sysctl.conf; then
# echo "Adding Mininet sysctl settings"
# sudo su -c "cat $MININET_DIR/mininet/util/sysctl_addon >> /etc/sysctl.conf"
#fi
## Load new sysctl settings:
#sudo sysctl -p
echo "Installing Mininet core"
pushd $MININET_DIR/mininet