Merge ~rodsmith/plainbox-provider-checkbox:fix-pxeboot-variable into plainbox-provider-checkbox:master

[Rod Smith]

Fixes a bug that could cause the test script to crash because of an unassigned variable. While I was at it, I tweaked a test failure message to make it clearer that it describes the source of the failure (per a recent discussion with Jeff).

[Paul Larson (pwlars)]

Looks good, +1

review: Approve

diff --git a/bin/efi-pxeboot b/bin/efi-pxeboot
index 724fefb..24ac231 100755
--- a/bin/efi-pxeboot
+++ b/bin/efi-pxeboot
@@ -49,6 +49,7 @@ def discover_data():
                 .splitlines())
     boot_entries = {}
     boot_order = []
+    boot_current = ""
     if len(bootinfo) > 1:
         for s in bootinfo:
             if "BootOrder" in s:
@@ -103,7 +104,7 @@ def is_pxe_booted(boot_entries, boot_order, boot_current):
             or "refind_" in desc:
         # This string indicates a boot directly from the normal Ubuntu GRUB
         # or rEFInd installation on the hard disk.
-        print("The system seems to have booted directly from the hard disk!")
+        print("FAIL: The system has booted directly from the hard disk!")
         retval = 1
     elif "SATA" in desc or "Sata" in desc or "Hard Drive" in desc:
         # These strings indicate booting with a "generic" disk entry (one