From 1f07530a54e82e41946bd3b9f5af714f449185f2 Mon Sep 17 00:00:00 2001 From: Brandon Heller Date: Wed, 24 Jul 2013 05:59:46 +0000 Subject: [PATCH] install.sh: Fix break from version overrides missing, + annotate them D'oh! Next time test presence _and_ absense of an added env var. OTOH, when people notice this quickly, it means they're using install.sh :-) --- util/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/install.sh b/util/install.sh index 0de6d48..1fd7eb0 100755 --- a/util/install.sh +++ b/util/install.sh @@ -89,6 +89,12 @@ OVS_TAG=v$OVS_RELEASE OVS_BUILD=$OVS_SRC/build-$KERNEL_NAME OVS_KMODS=($OVS_BUILD/datapath/linux/{openvswitch_mod.ko,brcompat_mod.ko}) +# Command-line versions overrides that simplify custom VM creation +# To use, pass in the vars on the cmd line before install.sh, e.g. +# WS_DISSECTOR_REV=pre-ws-1.10.0 install.sh -w +WS_DISSECTOR_REV=${WS_DISSECTOR_REV:-""} +OF13_SWITCH_REV=${OF13_SWITCH_REV:-""} + function kernel { echo "Install Mininet-compatible kernel if necessary" sudo apt-get update