commit: 3b0ff52abd04aa213c844b6d716d9edbe809dc65
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 20:20:05 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 00:22:24 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3b0ff52a
catalyst: Remove code to mount /proc in stage1root
Added in commit f75bb07f3cec (Added two patches from Joshua Kinard ...),
mounting /proc in stage1root purports to fix an issue in the preclean
stage. I have no idea what that issue was, but it doesn't occur now.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 5 -----
catalyst/targets/stage1.py | 11 +----------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 60cb891a..f8c1611e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -213,8 +213,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.mounts.append("shm")
self.mounts.append("run")
- self.set_mounts()
-
# Configure any user specified options (either in catalyst.conf or on
# the command line).
if "pkgcache" in self.settings["options"]:
@@ -586,9 +584,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
def set_stage_path(self):
self.settings["stage_path"] = normpath(self.settings["chroot_path"])
- def set_mounts(self):
- pass
-
def set_packages(self):
pass
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index daa0b854..93c62877 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -5,7 +5,7 @@ stage1 target
from catalyst import log
from catalyst.support import normpath
-from catalyst.fileops import ensure_dirs, move_path
+from catalyst.fileops import move_path
from catalyst.base.stagebase import StageBase
@@ -78,15 +78,6 @@ class stage1(StageBase):
"If you break it, you buy it. Don't complain to us about
it.\n"
"Don't say we did not warn you.")
- def set_mounts(self):
- # stage_path/proc probably doesn't exist yet, so create it
- ensure_dirs(self.settings["stage_path"]+"/proc")
-
- # alter the mount mappings to bind mount proc onto it
- self.mounts.append("stage1root/proc")
- self.target_mounts["stage1root/proc"] = "/tmp/stage1root/proc"
- self.mountmap["stage1root/proc"] = "/proc"
-
def set_completion_action_sequences(self):
'''Override function for stage1
