From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CA7C138330 for ; Sun, 14 Jan 2018 17:05:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 841CFE0937; Sun, 14 Jan 2018 17:05:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FD4FE0937 for ; Sun, 14 Jan 2018 17:05:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E53F4335C3B for ; Sun, 14 Jan 2018 17:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3203126 for ; Sun, 14 Jan 2018 17:05:37 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1515949530.1027c98b5617fceeadc96f479284d645e35595c5.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/Netboot.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 1027c98b5617fceeadc96f479284d645e35595c5 X-VCS-Branch: master Date: Sun, 14 Jan 2018 17:05:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fd801d96-e695-4028-9c1a-7cf512643b59 X-Archives-Hash: b311789528e1a8f9136039d995d0f55d commit: 1027c98b5617fceeadc96f479284d645e35595c5 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jan 14 17:05:30 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jan 14 17:05:30 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=1027c98b 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