From 1027c98b5617fceeadc96f479284d645e35595c5 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sun, 14 Jan 2018 12:05:30 -0500 Subject: grs/Netboot.py: fix path to ISO directory --- grs/Netboot.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/grs/Netboot.py b/grs/Netboot.py index c012c05..6b1fe7c 100644 --- a/grs/Netboot.py +++ b/grs/Netboot.py @@ -47,7 +47,7 @@ class Netboot(HashIt): self.medium_name = 'initramfs-%s-%s%s%s' % (name, self.year, self.month, self.day) self.digest_name = '%s.DIGESTS' % self.medium_name self.kernelname = 'kernel-%s-%s%s%s' % (name, self.year, self.month, self.day) - self.cd_name = '%s-%s%s%s.ISO' % (name, self.year, self.month, self.day) + self.cd_name = '%s-%s%s%s.iso' % (name, self.year, self.month, self.day) def netbootit(self, do_cd=None, alt_name=None): @@ -118,8 +118,9 @@ class Netboot(HashIt): # TODO: This code is rushed and we need a better way of # locating the tarball if do_cd == 'cd': - tarball_path = '/usr/share/grs-*/ISO-*.tar.gz' - cmd = 'tar --xattrs -xf %s -C %s' % (tarball_path, initramfs_root) + # TODO: Before a regular release, we'll have to fix this path + tarball_path = '/usr/share/grs-9999/ISO-1.tar.gz' + cmd = 'tar --xattrs -xf %s -C %s' % (tarball_path, self.kernelroot) Execute(cmd, timeout=120, logfile=self.logfile) # Note: we are copying the netboot kernel and initramfs into -- cgit v1.2.3-65-gdbad