labs: fix Windows batch file creation

Code Issues Proposed changes

This changeset reverts "labs: temporary wbatch fix" and replaces it with
a proper fix, allowing the creation of correct Windows batch files on
build hosts without VirtualBox.
Change-Id: Iad005ce9f0dcecb910fc09b2c43385dd42992eda

This commit is contained in:

Roger Luethi

2014年11月27日 13:42:29 +01:00

parent b1a907e782

commit 67db6e7aa3

7 changed files with 9 additions and 2746 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

12
labs/lib/osbash/virtualbox.functions

View File

@@ -129,11 +129,13 @@ function create_hostonlyif {

function create_network {

local ip=1ドル

# XXX We need host-only interface names as identifiers for wbatch; by

# always executing VBoxManage calls to ip_to_hostonlyif and

# create_hostonlyif we avoid the need to invent fake interface names

# If we are here only for wbatch, ignore actual network interfaces; just

# return a unique identifier (so it can be replaced with the interface

# name used by Windows).

${OSBASH:+:} mktemp -u XXXXXXXX

${OSBASH:+:} return 0

local if_name="$(OSBASH=exec_cmd ip_to_hostonlyif "$ip")"

local if_name="$(ip_to_hostonlyif "$ip")"

if [ -n "$if_name" ]; then

if hostonlyif_in_use "$if_name"; then

echo >&2 "Host-only interface $if_name ($ip) is in use." \

@@ -141,7 +143,7 @@ function create_network {

fi

else

echo >&2 "Creating host-only interface"

if_name=$(OSBASH=exec_cmd create_hostonlyif)

if_name=$(create_hostonlyif)

fi

echo >&2 "Configuring host-only network $ip ($if_name)"

labs: fix Windows batch file creation

12 labs/lib/osbash/virtualbox.functions Unescape Escape View File

12
labs/lib/osbash/virtualbox.functions

View File