From a7c7ddf977d552ee35093f864616651495688c44 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Mon, 23 May 2022 16:09:45 +0300 Subject: [PATCH] Split "chroot" into "copy_sysc" and "create_initramfs" in sysa's prepare() These better describe the actions, and will make more sense with the addition of the rootless bootstrap mode which would make use of these preparation steps. --- sysa.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sysa.py b/sysa.py index df61ca1..58163bc 100755 --- a/sysa.py +++ b/sysa.py @@ -34,9 +34,9 @@ class SysA(SysGeneral): self.sysb_dir = sysb_dir self.sysc_tmp = sysc_tmp - self.prepare(chroot) + self.prepare(chroot, not chroot) - def prepare(self, chroot): + def prepare(self, copy_sysc, create_initramfs): """ Prepare directory structure for System A. We create an empty tmpfs, unpack stage0-posix. @@ -50,9 +50,10 @@ class SysA(SysGeneral): # sysb must be added to sysa as it is another initramfs stage self.sysb() - if chroot: + if copy_sysc: self.sysc() - else: + + if create_initramfs: self.make_initramfs() def sysa(self):