From a89db3ec970740c9f21d09c41db73827128e31d8 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sat, 30 Aug 2014 13:49:57 +0200
Subject: [PATCH] labs: pass VM_NAME as an argument

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
---
 labs/lib/osbash/lib.fedora-20-x86_64            | 4 ++--
 labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 | 8 ++++----
 labs/lib/osbash/lib.ubuntu-14.04-server-amd64   | 8 ++++----
 labs/lib/osbash/virtualbox.functions            | 2 ++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/labs/lib/osbash/lib.fedora-20-x86_64 b/labs/lib/osbash/lib.fedora-20-x86_64
index 8a129307..2648658c 100644
--- a/labs/lib/osbash/lib.fedora-20-x86_64
+++ b/labs/lib/osbash/lib.fedora-20-x86_64
@@ -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:
diff --git a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
index 5881bdfb..a9c74aa4 100644
--- a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
+++ b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64
@@ -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:
diff --git a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
index facbabac..5ad44b4c 100644
--- a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
+++ b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64
@@ -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:
diff --git a/labs/lib/osbash/virtualbox.functions b/labs/lib/osbash/virtualbox.functions
index 3b2714be..f26693bb 100644
--- a/labs/lib/osbash/virtualbox.functions
+++ b/labs/lib/osbash/virtualbox.functions
@@ -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)"
 }