Minor bugfixes.

bin/setup-vpn.sh

@@ -150,6 +150,7 @@ EOF
     #
     # Generate the server-side config file(s).
     #
+    mkdir -p /etc/openvpn/ccd
     if [ $VPNTYPE = $TOPO_SUBNET -o $VPNTYPE = $TOPO_NET30 ]; then
 	cat <<EOF > /etc/openvpn/server.conf
 local $con_conlink_IP
@@ -245,7 +246,7 @@ EOF
 
 	    # XXX: do this in a script on server-side, somehow
 	    i=8
-	    while [ ! -f /sys/class/net/tun-$aggprefix -a $i -gt 0 ]; then
+	    while [ ! -f /sys/class/net/tun-$aggprefix -a $i -gt 0 ]; do
 		i=`expr $i - 1`
 		sleep 1
 	    done
@@ -258,8 +259,6 @@ EOF
 	exit 1
     fi
 
-    mkdir -p /etc/openvpn/ccd
-
     touch $OURDIR/vpn-server-done
 fi