Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
This commit is contained in:
commit
793909bafc
2 changed files with 7 additions and 8 deletions
|
@ -111,7 +111,7 @@ def create_fresh_os(vm_name, lucid=False, debian=False):
|
||||||
|
|
||||||
do_local('VBoxManage snapshot %s restore fresh_install'%vm_name)
|
do_local('VBoxManage snapshot %s restore fresh_install'%vm_name)
|
||||||
|
|
||||||
do_local('VBoxManage modifyvm "%s" --bridgeadapter1 wlan0'%vm_name)
|
do_local('VBoxManage modifyvm "%s" --bridgeadapter1 eth0'%vm_name)
|
||||||
do_local('VBoxManage startvm %s'%vm_name)
|
do_local('VBoxManage startvm %s'%vm_name)
|
||||||
print "Please wait while attempting to acquire IP address"
|
print "Please wait while attempting to acquire IP address"
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ def airtime_181_tar():
|
||||||
airtime_18x_tar("airtime", "1.8.1")
|
airtime_18x_tar("airtime", "1.8.1")
|
||||||
|
|
||||||
def airtime_182_tar():
|
def airtime_182_tar():
|
||||||
airtime_18x_tar("airtime-1.8.2" "1.8.2")
|
airtime_18x_tar("airtime-1.8.2", "1.8.2")
|
||||||
|
|
||||||
def airtime_18x_tar(root_dir, version):
|
def airtime_18x_tar(root_dir, version):
|
||||||
do_sudo('apt-get update')
|
do_sudo('apt-get update')
|
||||||
|
|
|
@ -2,12 +2,11 @@
|
||||||
|
|
||||||
exec 2>&1
|
exec 2>&1
|
||||||
|
|
||||||
target="airtime_git_branch"
|
target="airtime_git_branch:airtime-2.0.0-RC1"
|
||||||
#airtime_versions=("" "airtime_182_tar" "airtime_190_tar" "airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar")
|
airtime_versions=("" "airtime_180_tar" "airtime_181_tar" "airtime_182_tar" "airtime_190_tar" "airtime_191_tar" "airtime_192_tar" "airtime_193_tar" "airtime_194_tar" "airtime_195_tar")
|
||||||
airtime_versions=("airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar")
|
#airtime_versions=("airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar")
|
||||||
#airtime_versions=("")
|
ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64")
|
||||||
ubuntu_versions=("ubuntu_natty_64")
|
#ubuntu_versions=("ubuntu_natty_64")
|
||||||
#ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64")
|
|
||||||
|
|
||||||
num1=${#ubuntu_versions[@]}
|
num1=${#ubuntu_versions[@]}
|
||||||
num2=${#airtime_versions[@]}
|
num2=${#airtime_versions[@]}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue