Skip to content

elbepack/hdimg: copy filesystem content directly with mkfs if supported #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kanavin wants to merge 2 commits into from
Closed

elbepack/hdimg: copy filesystem content directly with mkfs if supported #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0bde7
elbepack/hdimg: avoid copying filesystem content with cp when possible
kanavin May 5, 2026
aa0561d
elbepack/hdimg.py: only mount a partition when operations need to be …
kanavin May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions elbepack/fstab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,25 @@ def get_label_opt(self):
if self.fstype == 'f2fs':
return '-l ' + self.label
return ''

def mkfs(self, loopdev, filesystem_tree):
mkfs_fs_copy_argument_dict = {
'ext2': f'-d {filesystem_tree}',
'ext3': f'-d {filesystem_tree}',
'ext4': f'-d {filesystem_tree}',
'btrfs': f'-r {filesystem_tree}',
'xfs': f'-p {filesystem_tree}'
}
mkfs_fs_copy_extra_cmd_dict = {'f2fs': f'sload.f2fs -f {filesystem_tree} {loopdev}'}
mkfs_supports_fs_copy = self.fstype in mkfs_fs_copy_argument_dict or \
self.fstype in mkfs_fs_copy_extra_cmd_dict

mkfs_fs_copy_argument = mkfs_fs_copy_argument_dict.get(self.fstype, '')
do(
f'mkfs.{self.fstype} {" ".join(self.mkfsopts)} {self.get_label_opt()} '
f'{mkfs_fs_copy_argument} '
f'{loopdev}')
if self.fstype in mkfs_fs_copy_extra_cmd_dict:
do(mkfs_fs_copy_extra_cmd_dict[self.fstype])

return not mkfs_supports_fs_copy
17 changes: 7 additions & 10 deletions elbepack/hdimg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,18 @@ def create_label(disk, part, ppart, fslabel, target, grub):
grub.add_fs_entry(entry)

with entry.losetup() as loopdev:
Comment thread
kanavin marked this conversation as resolved.
do(
f'mkfs.{entry.fstype} {" ".join(entry.mkfsopts)} {entry.get_label_opt()} '
f'{loopdev}')
filesystem_tree = os.path.join(target, 'filesystems', entry.id) + '/.'
needs_cp = entry.mkfs(loopdev, filesystem_tree)

_execute_fs_commands(entry.fs_device_commands, dict(device=loopdev))

mount_path = Path(target, 'imagemnt')

with mount(loopdev, mount_path, options=entry.options, force_writable=True):
_execute_fs_commands(entry.fs_path_commands, dict(path=mount_path))
do([
'cp', '-a',
os.path.join(target, 'filesystems', entry.id) + '/.',
str(mount_path) + '/',
])
if entry.fs_path_commands or needs_cp:
with mount(loopdev, mount_path, options=entry.options, force_writable=True):
_execute_fs_commands(entry.fs_path_commands, dict(path=mount_path))
if needs_cp:
do(['cp', '-a', filesystem_tree, str(mount_path) + '/'])

return ppart

Expand Down
Loading