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 4605213835A for ; Sat, 24 Oct 2020 22:07:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A2EDE090F; Sat, 24 Oct 2020 22:07:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 35B11E090F for ; Sat, 24 Oct 2020 22:07:52 +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 C8C6F340D6B for ; Sat, 24 Oct 2020 22:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 418163B8 for ; Sat, 24 Oct 2020 22:07:49 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603427388.6a4fa88d18afefc4aac328dd5bf60d2a13026f2e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage4.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6a4fa88d18afefc4aac328dd5bf60d2a13026f2e X-VCS-Branch: master Date: Sat, 24 Oct 2020 22:07: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ed3bd16-c4af-498d-b8fc-36b773110565 X-Archives-Hash: 1328f4323d360b25174f1fdf7eba6e71 Message-ID: <20201024220749.uo4KCwDMDRWCPajbBxUl68wY0lz7fORTNGGoGmUAPlk@z> commit: 6a4fa88d18afefc4aac328dd5bf60d2a13026f2e Author: Matt Turner gentoo org> AuthorDate: Fri Oct 23 04:28:48 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 23 04:29:48 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6a4fa88d catalyst: Explicitly keep /etc/resolv.conf in stage4 It was confusing to understand that /etc/resolv.conf was *kept* in stage4 because its set_cleanables() contained everything except it. This will simplify things if we want to add more common items to the cleanables list. Signed-off-by: Matt Turner gentoo.org> catalyst/targets/stage4.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index a9b3c936..346c0845 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -32,7 +32,11 @@ class stage4(StageBase): StageBase.__init__(self, spec, addlargs) def set_cleanables(self): - self.settings["cleanables"] = ["/var/tmp/*", "/tmp/*"] + StageBase.set_cleanables(self) + + # We want to allow stage4's fsscript to generate a default + # /etc/resolv.conf + self.settings["cleanables"].remove('/etc/resolv.conf') def set_action_sequence(self): self.settings['action_sequence'] = [