X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Frun-listmaker.sh;h=48f1abb9be5ab9b995ee40176691532ea482112e;hb=refs%2Fchanges%2F37%2F7837%2F6;hp=129e2d49fce535232c3834b1c834e3a45db18f6f;hpb=909f20348b5aac1207678d1c0af8bbfa50f716c6;p=csit.git

diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
index 129e2d49fc..48f1abb9be 100755
--- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
@@ -38,11 +38,11 @@ then
 fi
 DATE=$(date +%Y-%m-%d)
 
-if [ "$1" == "ubuntu-14.04.4" ]
+if [ "$1" = "ubuntu-14.04.4" ]
 then
     OS="ubuntu-14.04.4"
     VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-14.04.4.yaml"
-elif [ "$1" == "ubuntu-16.04.1" ]
+elif [ "$1" = "ubuntu-16.04.1" ]
 then
     OS="ubuntu-16.04.1"
     VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-16.04.1.yaml"
@@ -63,16 +63,17 @@ echo "Storing data in ${OUTPUT_DIR}/."
 
 APT_WANTLIST_INFRA="nfs-common cloud-init"
 APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan"
+APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake tcpdump"
 APT_WANTLIST_VPP="dkms bridge-utils"
 APT_WANTLIST_TREX="zlib1g-dev unzip"
-APT_WANTLIST_NESTED="qemu-system-x86"
+APT_WANTLIST_NESTED="socat qemu-system-x86"
 APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
 #Docker is currently disabled due to issues with apt repositories retrieval
 #APT_WANTLIST_DOCKER="docker-engine"
 
 # For now, let us NOT incude WANTLIST_NESTED in the below. We're installing qemu
 # separately from a separate source.
-APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $WANTLIST_TREX"
+APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $APT_WANTLIST_TREX $APT_WANTLIST_TLDK"
 
 APT_OUTPUTFILE="${OUTPUT_DIR}/apt-packages.txt"