fixups for Apple EFI support in mkefiboot

- actually import glob
- forgot quotes on 'if opt.imgtype == "apple"'
This commit is contained in:
Will Woods 2011-09-07 12:05:29 -04:00
parent 77a2b78269
commit 3ec9a12bf6

View File

@ -21,7 +21,7 @@ import os, tempfile, optparse
from subprocess import check_call, PIPE from subprocess import check_call, PIPE
from pylorax.imgutils import mkdosimg, round_to_blocks, LoopDev, DMDev, dm_detach from pylorax.imgutils import mkdosimg, round_to_blocks, LoopDev, DMDev, dm_detach
from pylorax.imgutils import mkhfsimg, Mount from pylorax.imgutils import mkhfsimg, Mount
import struct, shutil import struct, shutil, glob
def mkefiboot(bootdir, outfile, label): def mkefiboot(bootdir, outfile, label):
'''Make an EFI boot image with the contents of bootdir in EFI/BOOT''' '''Make an EFI boot image with the contents of bootdir in EFI/BOOT'''
@ -100,7 +100,7 @@ if __name__ == '__main__':
if opt.icon and not opt.imgtype == "apple": if opt.icon and not opt.imgtype == "apple":
print "Warning: --icon is only useful for Apple EFI images" print "Warning: --icon is only useful for Apple EFI images"
# do the thing! # do the thing!
if opt.imgtype == apple: if opt.imgtype == "apple":
mkmacboot(bootdir, outfile, opt.label, opt.icon) mkmacboot(bootdir, outfile, opt.label, opt.icon)
else: else:
mkefiboot(bootdir, outfile, opt.label) mkefiboot(bootdir, outfile, opt.label)