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 51970138334 for ; Sun, 11 Nov 2018 23:35:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71D97E0D69; Sun, 11 Nov 2018 23:35:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 49591E0D69 for ; Sun, 11 Nov 2018 23:35:52 +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 0D931335C29 for ; Sun, 11 Nov 2018 23:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 450DD3CF for ; Sun, 11 Nov 2018 23:35:49 +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: <1541979331.85345d4e5f9ab61413299368e506edc247d78a6b.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: 85345d4e5f9ab61413299368e506edc247d78a6b X-VCS-Branch: master Date: Sun, 11 Nov 2018 23:35:49 +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: b45a7ec7-9b13-4ede-8cb3-11b54ee69f2d X-Archives-Hash: 8fb5491e365410ca128fa5932d353129 commit: 85345d4e5f9ab61413299368e506edc247d78a6b Author: Anthony G. Basile gentoo org> AuthorDate: Sun Nov 11 23:35:31 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Nov 11 23:35:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=85345d4e grs/Netboot.py: control the entire alt-name for the initramfs/kernel/ISO Signed-off-by: Anthony G. Basile gentoo.org> grs/Netboot.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/grs/Netboot.py b/grs/Netboot.py index 33c7b9d..59bd34b 100644 --- a/grs/Netboot.py +++ b/grs/Netboot.py @@ -41,20 +41,22 @@ class Netboot(HashIt): self.kernelroot = kernelroot self.logfile = logfile # Prepare a year, month and day for a name timestamp. - self.year = str(datetime.now().year).zfill(4) - self.month = str(datetime.now().month).zfill(2) - self.day = str(datetime.now().day).zfill(2) - self.medium_name = 'initramfs-%s-%s%s%s' % (name, self.year, self.month, self.day) + year = str(datetime.now().year).zfill(4) + month = str(datetime.now().month).zfill(2) + day = str(datetime.now().day).zfill(2) + self.medium_name = 'initramfs-%s-%s%s%s' % (name, year, month, 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.kernelname = 'kernel-%s-%s%s%s' % (name, year, month, day) + self.cd_name = '%s-%s%s%s.iso' % (name, year, month, day) def netbootit(self, do_cd=None, alt_name=None): """ TODO """ if alt_name: - self.medium_name = 'initramfs-%s-%s%s%s' % (alt_name, self.year, self.month, self.day) + self.medium_name = 'initramfs-%s' % alt_name self.digest_name = '%s.DIGESTS' % self.medium_name + self.kernelname = 'kernel-%s' % alt_name + self.cd_name = '%s.iso' % alt_name # 1. Copy the kernel to the tmpdir directory. kernel_src = os.path.join(self.portage_configroot, 'boot/kernel')