Merge "labs: pass VM_NAME as an argument"

This commit is contained in:
Jenkins 2014-08-30 16:29:35 +00:00 committed by Gerrit Code Review
commit d5a7260c7d
4 changed files with 12 additions and 10 deletions

View File

@ -28,7 +28,7 @@ function vbox_distro_start_installer {
local BOOT_ARGS=$(printf "$_BOOT_ARGS" "${!KICKSTART}")
vbox_kbd_escape_key
vbox_kbd_escape_key "$VM_NAME"
vbox_sleep 1
@ -36,7 +36,7 @@ function vbox_distro_start_installer {
vbox_kbd_string_input "$VM_NAME" "$BOOT_ARGS"
echo "Initiating boot sequence"
vbox_kbd_enter_key
vbox_kbd_enter_key "$VM_NAME"
}
# vim: set ai ts=4 sw=4 et ft=sh:

View File

@ -37,9 +37,9 @@ function vbox_distro_start_installer {
local BOOT_ARGS=$(printf "$_BOOT_ARGS" "${!PRESEED}")
vbox_kbd_escape_key
vbox_kbd_escape_key
vbox_kbd_enter_key
vbox_kbd_escape_key "$VM_NAME"
vbox_kbd_escape_key "$VM_NAME"
vbox_kbd_enter_key "$VM_NAME"
vbox_sleep 1
@ -47,7 +47,7 @@ function vbox_distro_start_installer {
vbox_kbd_string_input "$VM_NAME" "$BOOT_ARGS"
echo "Initiating boot sequence"
vbox_kbd_enter_key
vbox_kbd_enter_key "$VM_NAME"
}
# vim: set ai ts=4 sw=4 et ft=sh:

View File

@ -36,9 +36,9 @@ function vbox_distro_start_installer {
local BOOT_ARGS=$(printf "$_BOOT_ARGS" "${!PRESEED}")
vbox_kbd_escape_key
vbox_kbd_escape_key
vbox_kbd_enter_key
vbox_kbd_escape_key "$VM_NAME"
vbox_kbd_escape_key "$VM_NAME"
vbox_kbd_enter_key "$VM_NAME"
vbox_sleep 1
@ -46,7 +46,7 @@ function vbox_distro_start_installer {
vbox_kbd_string_input "$VM_NAME" "$BOOT_ARGS"
echo "Initiating boot sequence"
vbox_kbd_enter_key
vbox_kbd_enter_key "$VM_NAME"
}
# vim: set ai ts=4 sw=4 et ft=sh:

View File

@ -670,10 +670,12 @@ function _vbox_push_scancode {
}
function vbox_kbd_escape_key {
local VM_NAME=$1
_vbox_push_scancode "$VM_NAME" "$(esc2scancode)"
}
function vbox_kbd_enter_key {
local VM_NAME=$1
_vbox_push_scancode "$VM_NAME" "$(enter2scancode)"
}