lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wireshark namespace conflict and don't reinstall

Browse Source
This commit is contained in:
Bob Lantz
2014-09-23 16:32:30 -07:00
parent 2ac4cd43da
commit 136c959191
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/install.sh
+5 -2
View File
@@ -208,15 +208,18 @@ function of13 {
} }
function wireshark { function install_wireshark {
if ! which wireshark; then
echo "Installing Wireshark" echo "Installing Wireshark"
if [ "$DIST" = "Fedora" ]; then if [ "$DIST" = "Fedora" ]; then
$install wireshark wireshark-gnome $install wireshark wireshark-gnome
else else
$install wireshark tshark $install wireshark tshark
fi fi
fi
# Copy coloring rules: OF is white-on-blue: # Copy coloring rules: OF is white-on-blue:
echo "Optionally installing wireshark color filters"
mkdir -p $HOME/.wireshark mkdir -p $HOME/.wireshark
cp -n $MININET_DIR/mininet/util/colorfilters $HOME/.wireshark cp -n $MININET_DIR/mininet/util/colorfilters $HOME/.wireshark
@@ -701,7 +704,7 @@ else
v) ovs;; v) ovs;;
V) OVS_RELEASE=$OPTARG; V) OVS_RELEASE=$OPTARG;
ubuntuOvs;; ubuntuOvs;;
w) wireshark;; w) install_wireshark;;
x) case $OF_VERSION in x) case $OF_VERSION in
1.0) nox;; 1.0) nox;;
1.3) nox13;; 1.3) nox13;;