From a89ee2824e751ffbff8f431252bc5e4547467e21 Mon Sep 17 00:00:00 2001 From: Martin Gracik Date: Thu, 22 Sep 2011 10:09:12 +0200 Subject: [PATCH] Don't use mk-s390-cdboot (dhorak) Anaconda dropped the mk-s390-cdboot tool, so we can't call it in lorax. --- src/pylorax/images.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/pylorax/images.py b/src/pylorax/images.py index abb1d859..d5aef7eb 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -655,24 +655,6 @@ class S390(object): "generic.ins": os.path.basename(generic_ins)} self.treeinfo.add_section(section, data) - # create cdboot.img - bootiso_fpath = joinpaths(self.outputroot, IMAGESDIR, "cdboot.img") - - # run mks390cdboot - mks390cdboot = joinpaths(self.installtree.root, "usr/libexec", - "anaconda", "mk-s390-cdboot") - - cmd = [mks390cdboot, "-i", kernel.fpath, "-r", initrd.fpath, - "-p", generic_prm, "-o", bootiso_fpath] - - p = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - p.wait() - - # add cdboot.img to treeinfo - data = {"cdboot.img": joinpaths(IMAGESDIR, "cdboot.img")} - self.treeinfo.add_section(section, data) - def create_boot(self, efiboot=None): pass