From 3e965f5a307b8e1c566265ef9fcf4ee1ae9ed46e Mon Sep 17 00:00:00 2001 From: Martin Gracik Date: Tue, 8 Mar 2011 12:27:31 +0100 Subject: [PATCH] memtest and efika.forth are in /boot --- src/pylorax/images.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pylorax/images.py b/src/pylorax/images.py index 4a220a8b..8cced476 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -105,7 +105,7 @@ class PPC(object): self.reqs["bootinfo_txt"] = cpfile(bootinfo_txt, workdir) # efika.forth - efika_forth = joinpaths(self.installtree.root, ANABOOTDIR, + efika_forth = joinpaths(self.installtree.root, "boot", "efika.forth") self.reqs["efika_forth"] = cpfile(efika_forth, workdir) @@ -370,8 +370,8 @@ class X86(object): syslinux_cfg = joinpaths(self.installtree.root, SYSLINUX_CFG) self.reqs["syslinux_cfg"] = cpfile(syslinux_cfg, workdir) - # memtest (XXX not from installroot/boot?) - memtest = glob.glob(joinpaths(self.installtree.root, ANABOOTDIR, + # memtest + memtest = glob.glob(joinpaths(self.installtree.root, "boot", "memtest*")) if memtest: