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 99FF4138330 for ; Sat, 13 Jan 2018 17:40:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98DC8E096F; Sat, 13 Jan 2018 17:40:14 +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 767FCE096F for ; Sat, 13 Jan 2018 17:40:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 506FA335C2C for ; Sat, 13 Jan 2018 17:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76406197 for ; Sat, 13 Jan 2018 17:40:10 +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: <1515865024.75b1b7cc4faf3c2fd455a5b6260e51c2b2a38c0b.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: 75b1b7cc4faf3c2fd455a5b6260e51c2b2a38c0b X-VCS-Branch: master Date: Sat, 13 Jan 2018 17:40:10 +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: 3527342f-1f9e-4669-b9d0-408d2efac097 X-Archives-Hash: a5d37d79b4598bffdae5f663cbc723cf commit: 75b1b7cc4faf3c2fd455a5b6260e51c2b2a38c0b Author: Anthony G. Basile gentoo org> AuthorDate: Sat Jan 13 17:37:04 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Jan 13 17:37:04 2018 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=75b1b7cc grs/Netboot.py: change name of source init script for netboot Since we want an init script for ISO images too, we need to rename the netboot init script to avoid a name collision. grs/Netboot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grs/Netboot.py b/grs/Netboot.py index 307b3b3..ae5a0a4 100644 --- a/grs/Netboot.py +++ b/grs/Netboot.py @@ -99,7 +99,7 @@ class Netboot(HashIt): Execute(cmd, timeout=None, logfile=self.logfile) # 4. Copy in the init script - init_src = os.path.join(self.libdir, 'scripts/init') + init_src = os.path.join(self.libdir, 'scripts/init.netboot') init_dst = os.path.join(initramfs_root, 'init') shutil.copy(init_src, init_dst) os.chmod(init_dst, 0o0755)