Skip to content
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

pyanaconda: payload: split rsync command for /boot/efi to handle FAT filesystem limitations #6030

Merged
merged 1 commit into from
Nov 29, 2024
+59 −20
Merged

pyanaconda: payload: split rsync command for /boot/efi to handle FAT filesystem limitations #6030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 21 additions & 1 deletion pyanaconda/modules/payloads/payload/live_image/installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def run(self):
"--exclude", "/run/",
"--exclude", "/boot/*rescue*",
"--exclude", "/boot/loader/",
"--exclude", "/boot/efi/loader/",
"--exclude", "/boot/efi/",
"--exclude", "/etc/machine-id",
"--exclude", "/etc/machine-info",
os.path.normpath(self._mount_point) + "/",
Expand All @@ -440,6 +440,26 @@ def run(self):
msg = "Failed to install image: {}".format(e)
raise PayloadInstallationError(msg) from None

if os.path.exists(os.path.join(self._mount_point, "boot/efi")):
# Handle /boot/efi separately due to FAT filesystem limitations
# FAT cannot support permissions, ownership, symlinks, hard links,
# xattrs, ACLs or modification times
args = [
"-rx",
"--stats", # show statistics at end of process
"--info=flist2,name,progress2", # show progress after each file
"--no-inc-recursive", # force calculating total work in advance
"--exclude", "/boot/efi/loader/",
os.path.normpath(self._mount_point) + "/boot/efi/",
os.path.join(self._sysroot, "boot/efi")
]

try:
execWithRedirect(cmd, args)
Comment on lines +457 to +458
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add

self.report_progress(_("Installing the /boot/efi content..."))

so this is not completely silent operation for users?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this interactively, and it tasks <1second to rsync this, it would be worse I believe to get the flashing string change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. In that case you can ignore this I guess.

except (OSError, RuntimeError) as e:
msg = "Failed to install /boot/efi from image: {}".format(e)
raise PayloadInstallationError(msg) from None

def _parse_rsync_update(self, line):
"""Try to extract progress from rsync output.
Expand Down
57 changes: 38 additions & 19 deletions tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_live.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,36 +91,55 @@ def _make_reader(self, rc):
return reader

@patch("pyanaconda.modules.payloads.payload.live_image.installation.os.sync")
@patch("pyanaconda.modules.payloads.payload.live_image.installation.execWithRedirect")
@patch("pyanaconda.modules.payloads.payload.live_image.installation.execReadlines")
def test_install_image_task(self, exec_readlines, os_sync):
def test_install_image_task(self, exec_readlines, exec_with_redirect, os_sync):
"""Test installation from an image task."""
exec_readlines.return_value = self._make_reader(0)
exec_with_redirect.return_value = 0

with tempfile.TemporaryDirectory() as mount_point:
task = InstallFromImageTask(
sysroot="/mnt/root",
mount_point=mount_point
)

task.run()

exec_readlines.assert_called_once_with("rsync", [
"-pogAXtlHrDx",
"--stats",
"--info=flist2,name,progress2",
"--no-inc-recursive",
"--exclude", "/dev/",
"--exclude", "/proc/",
"--exclude", "/tmp/*",
"--exclude", "/sys/",
"--exclude", "/run/",
"--exclude", "/boot/*rescue*",
"--exclude", "/boot/loader/",
"--exclude", "/boot/efi/loader/",
"--exclude", "/etc/machine-id",
"--exclude", "/etc/machine-info",
mount_point + "/",
"/mnt/root"
])
exec_readlines.assert_called_once_with("rsync", [
"-pogAXtlHrDx",
"--stats",
"--info=flist2,name,progress2",
"--no-inc-recursive",
"--exclude", "/dev/",
"--exclude", "/proc/",
"--exclude", "/tmp/*",
"--exclude", "/sys/",
"--exclude", "/run/",
"--exclude", "/boot/*rescue*",
"--exclude", "/boot/loader/",
"--exclude", "/boot/efi/",
"--exclude", "/etc/machine-id",
"--exclude", "/etc/machine-info",
mount_point + "/",
"/mnt/root"
])

exec_with_redirect.assert_not_called()

# Create /boot/efi directory in mount point.
os.makedirs(join_paths(mount_point, "boot/efi"))
task.run()

exec_with_redirect.assert_called_once_with("rsync", [
"-rx",
"--stats",
"--info=flist2,name,progress2",
"--no-inc-recursive",
"--exclude", "/boot/efi/loader/",
mount_point + "/boot/efi/",
"/mnt/root/boot/efi"
])

@patch("pyanaconda.modules.payloads.payload.live_image.installation.os.sync")
@patch("pyanaconda.modules.payloads.payload.live_image.installation.execReadlines")
Expand Down