andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename "chroot" to "create_disk_image" in sysc's prepare() 

This better describes the action, and will make more sense with the
addition of the rootless bootstrap mode that doesn't require a disk
image either.
This commit is contained in:
Dor Askayo 2022-05-23 16:00:07 +03:00
parent c429cf9dd7
commit fa2a09b63f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysc.py
View File

@ -33,7 +33,7 @@ class SysC(SysGeneral):
self.tmp_dir = os.path.join(tmpdir, 'sysc') self.tmp_dir = os.path.join(tmpdir, 'sysc')
os.mkdir(self.tmp_dir) os.mkdir(self.tmp_dir)
self.prepare(chroot) self.prepare(not chroot)
def __del__(self): def __del__(self):
if not self.preserve_tmp: if not self.preserve_tmp:
@ -43,7 +43,7 @@ class SysC(SysGeneral):
super().__del__() super().__del__()
def prepare(self, chroot): def prepare(self, create_disk_image):
""" """
Prepare directory structure for System C. Prepare directory structure for System C.
""" """
@ -51,7 +51,7 @@ class SysC(SysGeneral):
rootfs_dir = None rootfs_dir = None
if not chroot: if create_disk_image:
# Create + mount a disk for QEMU to use # Create + mount a disk for QEMU to use
disk_path = os.path.join(self.tmp_dir, 'disk.img') disk_path = os.path.join(self.tmp_dir, 'disk.img')
self.dev_name = create_disk(disk_path, "msdos", "ext4", '8G') self.dev_name = create_disk(disk_path, "msdos", "ext4", '8G')
@ -68,8 +68,8 @@ class SysC(SysGeneral):
copytree(self.sys_dir, rootfs_dir, ignore=shutil.ignore_patterns("tmp")) copytree(self.sys_dir, rootfs_dir, ignore=shutil.ignore_patterns("tmp"))
# Unmount tmp/mnt if it exists # Unmount tmp/mnt if it was mounted
if not chroot: if create_disk_image:
umount(rootfs_dir) umount(rootfs_dir)
# pylint: disable=line-too-long,too-many-statements # pylint: disable=line-too-long,too-many-statements