openstack/training-guides
Code Issues Proposed changes

labs: pass VM_NAME as an argument

Browse Source 
Don't pass VM_NAME via environment variable to vbox_kbd_escape_key and
vbox_kbd_enter_key. Use an argument instead.

Change-Id: I7714f52ab4f80a83595e052974258e9f2e597435
This commit is contained in:
Roger Luethi 2014-08-30 13:49:57 +02:00
parent 46fb39a978
commit a89db3ec97
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/lib/osbash/lib.fedora-20-x86_64
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:

8
labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
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:

8
labs/lib/osbash/lib.ubuntu-14.04-server-amd64
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:

2
labs/lib/osbash/virtualbox.functions
View File

@ -669,10 +669,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)"
}