Try to make format mostly consistent. No tabs for the moment, although

we could switch to smart tabs (i.e. tab for indent, space for align.)
This commit is contained in:
Bob Lantz
2012-02-01 15:29:53 -08:00
parent d990eb0717
commit c120e37897
+12 -6
View File
@@ -63,7 +63,9 @@ function kernel {
# Ensure /boot/grub/menu.lst boots with initrd image: # Ensure /boot/grub/menu.lst boots with initrd image:
sudo update-grub sudo update-grub
# The default should be the new kernel. Otherwise, you may need to modify /boot/grub/menu.lst to set the default to the entry corresponding to the kernel you just installed. # The default should be the new kernel. Otherwise, you may need to modify
# /boot/grub/menu.lst to set the default to the entry corresponding to the
# kernel you just installed.
fi fi
} }
@@ -89,7 +91,8 @@ function mn_deps {
sudo easy_install --upgrade networkx sudo easy_install --upgrade networkx
fi fi
#Add sysctl parameters as noted in the INSTALL file to increase kernel limits to support larger setups: # Add sysctl parameters as noted in the INSTALL file to increase kernel
# limits to support larger setups:
sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf" sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf"
# Load new sysctl settings: # Load new sysctl settings:
@@ -111,7 +114,8 @@ function of {
echo "Installing OpenFlow and its tools..." echo "Installing OpenFlow and its tools..."
cd ~/ cd ~/
sudo apt-get install -y git-core automake m4 pkg-config libtool make libc6-dev autoconf autotools-dev gcc sudo apt-get install -y git-core automake m4 pkg-config libtool \
make libc6-dev autoconf autotools-dev gcc
git clone git://openflowswitch.org/openflow.git git clone git://openflowswitch.org/openflow.git
cd ~/openflow cd ~/openflow
@@ -134,7 +138,8 @@ function of {
mkdir -p ~/.wireshark mkdir -p ~/.wireshark
cp ~/mininet/util/colorfilters ~/.wireshark cp ~/mininet/util/colorfilters ~/.wireshark
# Remove avahi-daemon, which may cause unwanted discovery packets to be sent during tests, near link status changes: # Remove avahi-daemon, which may cause unwanted discovery packets to be
# sent during tests, near link status changes:
sudo apt-get remove -y avahi-daemon sudo apt-get remove -y avahi-daemon
# Disable IPv6. Add to /etc/modprobe.d/blacklist: # Disable IPv6. Add to /etc/modprobe.d/blacklist:
@@ -187,7 +192,8 @@ function nox {
echo "Installing NOX w/tutorial files..." echo "Installing NOX w/tutorial files..."
# Install NOX deps: # Install NOX deps:
sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libxerces-c2-dev libssl-dev make sudo apt-get -y install autoconf automake g++ libtool python python-twisted \
swig libxerces-c2-dev libssl-dev make
if [ "$DIST" = "Debian" ]; then if [ "$DIST" = "Debian" ]; then
sudo apt-get -y install libboost1.35-dev sudo apt-get -y install libboost1.35-dev
elif [ "$DIST" = "Ubuntu" ]; then elif [ "$DIST" = "Ubuntu" ]; then
@@ -326,7 +332,7 @@ function vm_clean {
history -c # note this won't work if you have multiple bash sessions history -c # note this won't work if you have multiple bash sessions
rm -f ~/.bash_history # need to clear in memory and remove on disk rm -f ~/.bash_history # need to clear in memory and remove on disk
rm -f ~/.ssh/id_rsa* ~/.ssh/known_hosts rm -f ~/.ssh/id_rsa* ~/.ssh/known_hosts
sudo rm -f ~/.ssh/authorized_keys2 sudo rm -f ~/.ssh/authorized_keys*
# Remove Mininet files # Remove Mininet files
#sudo rm -f /lib/modules/python2.5/site-packages/mininet* #sudo rm -f /lib/modules/python2.5/site-packages/mininet*