From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 50D421393F1 for ; Mon, 14 Sep 2015 05:32:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9288021C097; Mon, 14 Sep 2015 05:32:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E32E21C097 for ; Mon, 14 Sep 2015 05:32:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0026A34087F for ; Mon, 14 Sep 2015 05:32:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4915178 for ; Mon, 14 Sep 2015 05:32:34 +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: <1442209032.efdd9595bd4af8e636b46f4eb10a7f75637d4b6e.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/ISOIt.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: efdd9595bd4af8e636b46f4eb10a7f75637d4b6e X-VCS-Branch: master Date: Mon, 14 Sep 2015 05:32:34 +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: 09f8ea6b-d54c-4771-bc1a-3c287fdd6193 X-Archives-Hash: 7688cb0cd789de358ce750bc1bc08710 commit: efdd9595bd4af8e636b46f4eb10a7f75637d4b6e Author: Anthony G. Basile gentoo org> AuthorDate: Mon Sep 14 05:37:12 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Sep 14 05:37:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=efdd9595 grs/ISOIt.py: do not remove /boot from system root. grs/ISOIt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grs/ISOIt.py b/grs/ISOIt.py index dcf05fe..ff63506 100644 --- a/grs/ISOIt.py +++ b/grs/ISOIt.py @@ -117,7 +117,8 @@ class ISOIt(HashIt): kernelimage_dir = os.path.join(self.portage_configroot, 'boot') kernelimage_path = os.path.join(kernelimage_dir, 'kernel') shutil.copy(kernelimage_path, isoboot_dir) - shutil.rmtree(kernelimage_dir, ignore_errors=True) + # If this fails, we'll have to rebuild the kernel! + #shutil.rmtree(kernelimage_dir, ignore_errors=True) # 3. make the squashfs image and copy it into the iso/boot squashfs_path = os.path.join(iso_dir, 'rootfs')