mkefiboot fixups (fix imports, mkdosimg, add to setup.py)

This commit is contained in:
Will Woods 2011-05-09 22:56:14 -04:00
parent 10a91e5c85
commit 4343b12fc0
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ for root, dnames, fnames in os.walk("share"):
[os.path.join(root, fname)])) [os.path.join(root, fname)]))
# executable # executable
data_files.append(("/usr/sbin", ["src/sbin/lorax"])) data_files.append(("/usr/sbin", ["src/sbin/lorax", "src/sbin/mkefiboot"]))
setup(name="lorax", setup(name="lorax",
version="0.1", version="0.1",

View File

@ -19,11 +19,11 @@
import os, tempfile, optparse import os, tempfile, optparse
from subprocess import check_call, PIPE from subprocess import check_call, PIPE
from lorax.imgutils import mkdosimg, round_to_blocks, LoopDev, DMDev, dm_detach from pylorax.imgutils import mkdosimg, round_to_blocks, LoopDev, DMDev, dm_detach
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'''
mkdosimg(None, outfile, label, graft={'EFI/BOOT':bootdir}) mkdosimg(None, outfile, label=label, graft={'EFI/BOOT':bootdir})
def mkefidisk(efiboot, outfile): def mkefidisk(efiboot, outfile):
'''Make a bootable EFI disk image out of the given EFI boot image.''' '''Make a bootable EFI disk image out of the given EFI boot image.'''