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 27034138330 for ; Thu, 15 Sep 2016 00:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15445E0AEE; Thu, 15 Sep 2016 00:57:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC333E0B1F for ; Thu, 15 Sep 2016 00:57:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65E95340A35 for ; Thu, 15 Sep 2016 00:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8FD42487 for ; Thu, 15 Sep 2016 00:57:01 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1473891107.36f490a4476148f800fb7c16a6b45d46cc6ee4f7.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-controller.sh targets/stage1/stage1-preclean-chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 36f490a4476148f800fb7c16a6b45d46cc6ee4f7 X-VCS-Branch: master Date: Thu, 15 Sep 2016 00:57:01 +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: 2f1e362c-38d2-464d-b1a7-d474ce2c1133 X-Archives-Hash: ea336fad75c4e1b94e84ce5f4c9bfb0a Message-ID: <20160915005701.4xs1EKFDx_aHA200docLnGEheNteI1kcWSHIjuL_ZZY@z> commit: 36f490a4476148f800fb7c16a6b45d46cc6ee4f7 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Wed Sep 14 22:11:47 2016 +0000 Commit: Richard Farina gentoo org> CommitDate: Wed Sep 14 22:11:47 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36f490a4 stage1-controller.sh was *not running in chroot*, move it's functions into the pre-clean which does safely run in chroot targets/stage1/stage1-controller.sh | 5 +---- targets/stage1/stage1-preclean-chroot.sh | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 6af1385..ac813de 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -27,10 +27,7 @@ case "$1" in ;; clean) - # Clean out man, info and doc files - rm -rf /tmp/stage1root/usr/share/{man,doc,info}/* - # Zap all .pyc and .pyo files - find /tmp/stage1root/ -iname "*.py[co]" -exec rm -f {} \; + exit 0 ;; *) diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index 0ba4c00..1b623f1 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -22,6 +22,11 @@ else echo UTC > "${ROOT}/etc/TZ" fi +# Clean out man, info and doc files +rm -rf "${ROOT}"/usr/share/{man,doc,info}/* +# Zap all .pyc and .pyo files +find "${ROOT}"/ -iname "*.py[co]" -exec rm -f {} \; + # unset ROOT for safety (even though cleanup_stages doesn't use it) unset ROOT cleanup_stages