public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 4/5] catalyst: Explicitly keep /etc/resolv.conf in stage4
Date: Thu, 22 Oct 2020 21:50:17 -0700	[thread overview]
Message-ID: <20201023045018.567245-4-mattst88@gentoo.org> (raw)
In-Reply-To: <20201023045018.567245-1-mattst88@gentoo.org>

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 <mattst88@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'] = [
-- 
2.26.2



  parent reply	other threads:[~2020-10-23  4:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-23  4:50 [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 2/5] catalyst: Drop stray vim modeline Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 3/5] catalyst: Drop useless stage3 set_cleanables() Matt Turner
2020-10-23  4:50 ` Matt Turner [this message]
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 5/5] catalyst: Don't delete /usr/share/zoneinfo from stage1 Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201023045018.567245-4-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox