morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: restore cross-architecture booting

Browse Source 
The check added by 4c27749b8c breaks
booting an arm64 image on x86 using qemu-bin-fmt, so remove it.
Without it, the image built with mkosi --architecture=aarch64
boots fine in nspawn.
This commit is contained in:
Luca Boccassi
2023-05-26 12:42:42 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent 998db5871f
commit af262e5fa2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nspawn/nspawn.c
View File

@@ -3397,10 +3397,10 @@ static int inner_child(
if (r < 0)
return log_error_errno(r, "personality() failed: %m");
#endif
} else if (arg_architecture >= 0 && arg_architecture != native_architecture())
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Selected architecture '%s' not supported locally, refusing.",
architecture_to_string(arg_architecture));
} else if (!arg_quiet && arg_architecture >= 0 && arg_architecture != native_architecture())
log_notice("Selected architecture '%s' not supported natively on the local CPU, assuming "
"invocation with qemu userspace emulator (or equivalent) in effect.",
architecture_to_string(arg_architecture));
r = setrlimit_closest_all((const struct rlimit *const*) arg_rlimit, &which_failed);
if (r < 0)