synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install: add install_fsprogs (MR 2011) 

Install specific filesystem tools right before they are needed, instead
of installing all filesystem tools that we might need beforehand. This
is in preparation to support f2fs.

Co-Authored-By: Oliver Smith <ollieparanoid@postmarketos.org>
This commit is contained in:
Bobby The Builder 2021-03-07 08:37:59 -05:00 committed by Oliver Smith
parent f758812f64
commit 958ecc6c72
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmb/config/__init__.py
View File

@ -137,6 +137,12 @@ locales = [
"sv_SE.UTF-8"
]
# Supported filesystems and their fstools packages
filesystems = {"ext2": "e2fsprogs",
"ext4": "e2fsprogs",
"f2fs": "f2fs-tools",
"fat16": "dosfstools",
"fat32": "dosfstools"}
# Legacy channels and their new names (pmb#2015)
pmaports_channels_legacy = {"stable": "v20.05",
@ -450,7 +456,7 @@ default_ip = "172.16.42.1"
# Packages, that will be installed inside the native chroot to perform
# the installation to the device.
# util-linux: losetup, fallocate
install_native_packages = ["cryptsetup", "util-linux", "e2fsprogs", "parted", "dosfstools"]
install_native_packages = ["cryptsetup", "util-linux", "parted"]
install_device_packages = ["postmarketos-base"]
# Groups for the default user

12
pmb/install/format.py
View File

@ -5,6 +5,14 @@ import logging
import pmb.chroot
def install_fsprogs(args, filesystem):
""" Install the package required to format a specific filesystem. """
fsprogs = pmb.config.filesystems.get(filesystem)
if not fsprogs:
raise RuntimeError(f"Unsupported filesystem: {filesystem}")
pmb.chroot.apk.install(args, [fsprogs])
def format_and_mount_boot(args, boot_label):
"""
:param boot_label: label of the root partition (e.g. "pmOS_boot")
@ -15,6 +23,7 @@ def format_and_mount_boot(args, boot_label):
mountpoint = "/mnt/install/boot"
device = "/dev/installp1"
filesystem = args.deviceinfo["boot_filesystem"] or "ext2"
install_fsprogs(args, filesystem)
logging.info(f"(native) format {device} (boot, {filesystem}), mount to"
" mountpoint")
if filesystem == "fat16":
@ -66,7 +75,6 @@ def format_and_mount_root(args, device, root_label, sdcard):
"""
# Format
if not args.rsync:
logging.info("(native) format " + device)
# Some downstream kernels don't support metadata_csum (#1364).
# When changing the options of mkfs.ext4, also change them in the
# recovery zip code (see 'grep -r mkfs\.ext4')!
@ -79,6 +87,8 @@ def format_and_mount_root(args, device, root_label, sdcard):
if not sdcard:
mkfs_ext4_args = mkfs_ext4_args + ["-N", "100000"]
install_fsprogs(args, "ext4")
logging.info("(native) format " + device)
pmb.chroot.root(args, mkfs_ext4_args + [device])
# Mount