summaryrefslogtreecommitdiff
diff options
authorRod Smith <rod.smith@canonical.com>2018-06-20 09:15:37 -0400
committerRod Smith <rod.smith@canonical.com>2018-06-20 09:15:37 -0400
commit682176feb595226dbe94078670f71711bcc1454f (patch)
treeb07ab26ccc7330f744000b10828341c531b64124
parent8060f0341ef10727c400bf73e45247c06f3338f6 (diff)
Fixed bug caused by an unassigned variable. Also modified a test
failure message to make it a bit clearer.
-rwxr-xr-xbin/efi-pxeboot3
1 files changed, 2 insertions, 1 deletions
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