Revision 276bdaf0

View differences:

util/install.sh
82 82
# Install Mininet deps
83 83
function mn_deps {
84 84
	echo "Installing Mininet dependencies"
85
	sudo apt-get install -y gcc make screen psmisc xterm ssh iperf iproute python-setuptools
85
	sudo aptitude install -y gcc make screen psmisc xterm ssh iperf iproute \
86
        python-setuptools python-networkx
86 87

  
87 88
	#Add sysctl parameters as noted in the INSTALL file to increase kernel limits to support larger setups:
88 89
	sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf"
......
144 145
	echo "Installing OpenVSwitch..."
145 146

  
146 147
    if [ "$DIST" = "Debian" ]; then
148
        sudo aptitude -y install pkg-config gcc make git-core python-dev libssl-dev
147 149
        #Install Autoconf 2.63+ backport from Debian Backports repo:
148 150
        #Instructions from http://backports.org/dokuwiki/doku.php?id=instructions
149 151
        sudo su -c "echo 'deb http://www.backports.org/debian lenny-backports main contrib non-free' >> /etc/apt/sources.list"
......
165 167
	cd $OVS_RELEASE
166 168
	./boot.sh
167 169
    BUILDDIR=/lib/modules/${KERNEL_NAME}/build
168
    mkdir -p $BUILDDIR
170
    if [ ! -e $BUILDDIR ]; then
171
        echo "Creating build directory $BUILDDIR"
172
        sudo mkdir -p $BUILDDIR
173
    fi
169 174
    opts="--with-l26=$BUILDDIR"
170 175
	./configure $opts
171 176
	make
......
352 357
    printf -- ' -n: install mini(N)et dependencies + core files\n' >&2
353 358
    printf -- ' -t: install o(T)her stuff\n' >&2
354 359
    printf -- ' -v: install open (V)switch\n' >&2
355
    printf -- ' -x: install NOX(X) OpenFlow contoller\n' >&2
360
    printf -- ' -x: install NO(X) OpenFlow controller\n' >&2
356 361
    printf -- ' -y: install (A)ll packages\n' >&2    
357 362
    
358 363
    exit 2

Also available in: Unified diff