Merge pull request #194 from jpoliv/master

Make install.sh (-n) work in Fedora 19

util/install.sh

@@ -47,6 +47,19 @@ if [ "$DIST" = "Ubuntu" ] || [ "$DIST" = "Debian" ]; then
         $install bc
     fi
 fi
+test -e /etc/fedora-release && DIST="Fedora"
+if [ "$DIST" = "Fedora" ]; then
+    install='sudo yum -y install'
+    remove='sudo yum -y erase'
+    pkginst='sudo rpm -ivh'
+    # Prereqs for this script
+    if ! which lsb_release &> /dev/null; then
+        $install redhat-lsb-core
+    fi
+    if ! which bc &> /dev/null; then
+        $install bc
+    fi
+fi
 if which lsb_release &> /dev/null; then
     DIST=`lsb_release -is`
     RELEASE=`lsb_release -rs`
@@ -67,8 +80,11 @@ elif [ "$DIST" = "Debian" ] && [ "$ARCH" = "i386" ] && [ "$CODENAME" = "lenny" ]
     KERNEL_NAME=2.6.33.1-mininet
     KERNEL_HEADERS=linux-headers-${KERNEL_NAME}_${KERNEL_NAME}-10.00.Custom_i386.deb
     KERNEL_IMAGE=linux-image-${KERNEL_NAME}_${KERNEL_NAME}-10.00.Custom_i386.deb
+elif [ "$DIST" = "Fedora" ]; then
+    KERNEL_NAME=`uname -r`
+    KERNEL_HEADERS=kernel-headers-${KERNEL_NAME}
 else
-    echo "Install.sh currently only supports Ubuntu and Debian Lenny i386."
+    echo "Install.sh currently only supports Ubuntu, Debian Lenny i386 and Fedora."
     exit 1
 fi
 
@@ -140,9 +156,15 @@ function kernel_clean {
 # Install Mininet deps
 function mn_deps {
     echo "Installing Mininet dependencies"
-    $install gcc make socat psmisc xterm ssh iperf iproute telnet \
+    if [ "$DIST" = "Fedora" ]; then
-        python-setuptools cgroup-bin ethtool help2man \
+        $install gcc make socat psmisc xterm openssh-clients iperf \
-        pyflakes pylint pep8
+            iproute telnet python-setuptools libcgroup-tools \
+            ethtool help2man pyflakes pylint python-pep8
+    else
+        $install gcc make socat psmisc xterm ssh iperf iproute telnet \
+            python-setuptools cgroup-bin ethtool help2man \
+            pyflakes pylint pep8
+    fi
 
     echo "Installing Mininet core"
     pushd $MININET_DIR/mininet
@@ -164,8 +186,12 @@ function mn_dev {
 function of {
     echo "Installing OpenFlow reference implementation..."
     cd $BUILD_DIR/
-    $install git-core autoconf automake autotools-dev pkg-config \
+    $install autoconf automake libtool make gcc
-		make gcc libtool libc6-dev
+    if [ "$DIST" = "Fedora" ]; then
+        $install git pkgconfig glibc-devel
+    else
+        $install git-core autotools-dev pkg-config libc6-dev
+    fi
     git clone git://openflowswitch.org/openflow.git
     cd $BUILD_DIR/openflow
 
@@ -515,7 +541,11 @@ function oftest {
 function cbench {
     echo "Installing cbench..."
 
-    $install libsnmp-dev libpcap-dev libconfig-dev
+    if [ "$DIST" = "Fedora" ]; then
+        $install net-snmp-devel libpcap-devel libconfig-devel
+    else
+        $install libsnmp-dev libpcap-dev libconfig-dev
+    fi
     cd $BUILD_DIR/
     git clone git://openflow.org/oflops.git
     cd oflops
@@ -607,6 +637,14 @@ function modprobe {
 }
 
 function all {
+    if [ "$DIST" = "Fedora" ]; then
+        printf "\nFedora 19 support status:\n"
+        printf "the install script options -b, -f, -n, and -p should work.\n\n"
+        printf "Just try:\n"
+        printf "    install.sh -fnp\n"
+        printf "with Fedora's kernel (3.10) and openvswitch (1.10.0) packages.\n"
+        exit 3
+    fi
     echo "Installing all packages except for -eix (doxypy, ivs, nox-classic)..."
     kernel
     mn_deps