From 4343b12fc00a44b8626be4cb9c9a7bec27542fbc Mon Sep 17 00:00:00 2001 From: Will Woods Date: Mon, 9 May 2011 22:56:14 -0400 Subject: [PATCH] mkefiboot fixups (fix imports, mkdosimg, add to setup.py) --- setup.py | 2 +- src/sbin/mkefiboot | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e0266512..892fb95c 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ for root, dnames, fnames in os.walk("share"): [os.path.join(root, fname)])) # executable -data_files.append(("/usr/sbin", ["src/sbin/lorax"])) +data_files.append(("/usr/sbin", ["src/sbin/lorax", "src/sbin/mkefiboot"])) setup(name="lorax", version="0.1", diff --git a/src/sbin/mkefiboot b/src/sbin/mkefiboot index 6f39625c..0a7ef22f 100755 --- a/src/sbin/mkefiboot +++ b/src/sbin/mkefiboot @@ -19,11 +19,11 @@ import os, tempfile, optparse 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): '''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): '''Make a bootable EFI disk image out of the given EFI boot image.'''