diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-11-25 17:36:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-25 17:36:57 +0100 |
| commit | 7ff048a718afd7670c84c6dbd94c0eda0f8269c7 (patch) | |
| tree | 922862e1594049fa98a331269288f58de4a55745 /src/basic/process-util.c | |
| parent | journal: Add more information to --verify error messages (diff) | |
| parent | mkosi: Install sd-boot using postinst script instead of in build script (diff) | |
| download | systemd-7ff048a718afd7670c84c6dbd94c0eda0f8269c7.tar.xz systemd-7ff048a718afd7670c84c6dbd94c0eda0f8269c7.zip | |
Merge pull request #21487 from DaanDeMeyer/dissect-image-other-arch
Allow dissect_image() to dissect images from architectures other than the native one
Diffstat (limited to 'src/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 1dd2414bb2..bdadec4072 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1045,8 +1045,8 @@ unsigned long personality_from_string(const char *p) { if (architecture == native_architecture()) return PER_LINUX; -#ifdef SECONDARY_ARCHITECTURE - if (architecture == SECONDARY_ARCHITECTURE) +#ifdef ARCHITECTURE_SECONDARY + if (architecture == ARCHITECTURE_SECONDARY) return PER_LINUX32; #endif @@ -1058,9 +1058,9 @@ const char* personality_to_string(unsigned long p) { if (p == PER_LINUX) architecture = native_architecture(); -#ifdef SECONDARY_ARCHITECTURE +#ifdef ARCHITECTURE_SECONDARY else if (p == PER_LINUX32) - architecture = SECONDARY_ARCHITECTURE; + architecture = ARCHITECTURE_SECONDARY; #endif if (architecture < 0) |