Revision 15f2d240

View differences:

util/install.sh
47 47
        $install bc
48 48
    fi
49 49
fi
50
test -e /etc/fedora-release && DIST="Fedora"
51
if [ "$DIST" = "Fedora" ]; then
52
    install='sudo yum -y install'
53
    remove='sudo yum -y erase'
54
    pkginst='sudo rpm -ivh'
55
    # Prereqs for this script
56
    if ! which lsb_release &> /dev/null; then
57
        $install redhat-lsb-core
58
    fi
59
    if ! which bc &> /dev/null; then
60
        $install bc
61
    fi
62
fi
50 63
if which lsb_release &> /dev/null; then
51 64
    DIST=`lsb_release -is`
52 65
    RELEASE=`lsb_release -rs`
......
67 80
    KERNEL_NAME=2.6.33.1-mininet
68 81
    KERNEL_HEADERS=linux-headers-${KERNEL_NAME}_${KERNEL_NAME}-10.00.Custom_i386.deb
69 82
    KERNEL_IMAGE=linux-image-${KERNEL_NAME}_${KERNEL_NAME}-10.00.Custom_i386.deb
83
elif [ "$DIST" = "Fedora" ]; then
84
    KERNEL_NAME=`uname -r`
85
    KERNEL_HEADERS=kernel-headers-${KERNEL_NAME}
70 86
else
71
    echo "Install.sh currently only supports Ubuntu and Debian Lenny i386."
87
    echo "Install.sh currently only supports Ubuntu, Debian Lenny i386 and Fedora."
72 88
    exit 1
73 89
fi
74 90

  
......
140 156
# Install Mininet deps
141 157
function mn_deps {
142 158
    echo "Installing Mininet dependencies"
143
    $install gcc make socat psmisc xterm ssh iperf iproute telnet \
144
        python-setuptools cgroup-bin ethtool help2man \
145
        pyflakes pylint pep8
159
    if [ "$DIST" = "Fedora" ]; then
160
        $install gcc make socat psmisc xterm openssh-clients iperf \
161
            iproute telnet python-setuptools libcgroup-tools \
162
            ethtool help2man pyflakes pylint python-pep8
163
    else
164
        $install gcc make socat psmisc xterm ssh iperf iproute telnet \
165
            python-setuptools cgroup-bin ethtool help2man \
166
            pyflakes pylint pep8
167
    fi
146 168

  
147 169
    echo "Installing Mininet core"
148 170
    pushd $MININET_DIR/mininet

Also available in: Unified diff