SingleVM: Rename macvlan0 to ciaovlan

Signed-off-by: Manohar Castelino <[email protected]>
ciao-project · Oct 18, 2016 · bc77fbe · bc77fbe
1 parent 900deed
commit bc77fbe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/testutil/singlevm/cleanup.sh b/testutil/singlevm/cleanup.sh
@@ -10,7 +10,7 @@ sudo killall ciao-launcher
 sleep 2
 sudo "$ciao_gobin"/ciao-launcher --alsologtostderr -v 3 --hard-reset
 sudo ip link del ciao_eth
-sudo pkill -F /tmp/dnsmasq.macvlan0.pid
+sudo pkill -F /tmp/dnsmasq.ciaovlan.pid
 sudo docker rm -v -f ceph-demo
 sudo rm /etc/ceph/*
 sudo rm /etc/pki/ciao/controller_key.pem /etc/pki/ciao/ciao-image-key.pem

diff --git a/testutil/singlevm/dnsmasq.conf.macvlan0 → testutil/singlevm/dnsmasq.conf.ciaovlan b/testutil/singlevm/dnsmasq.conf.macvlan0 → testutil/singlevm/dnsmasq.conf.ciaovlan
diff --git a/testutil/singlevm/setup.sh b/testutil/singlevm/setup.sh
@@ -268,8 +268,8 @@ fi
 # Set DHCP server with dnsmasq
 sudo mkdir -p /var/lib/misc
 if [ -x "$(command -v ip)" ]; then
-    sudo dnsmasq -C $ciao_scripts/dnsmasq.conf.macvlan0 \
-	 --pid-file=/tmp/dnsmasq.macvlan0.pid
+    sudo dnsmasq -C $ciao_scripts/dnsmasq.conf.ciaovlan \
+	 --pid-file=/tmp/dnsmasq.ciaovlan.pid
 else
     echo 'dnsmasq command is not supported'
 fi