From c0623cdab06ebe42bcc0682712f51b02278a9763 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Tue, 2 Jul 2024 08:12:52 -0700 Subject: [PATCH] fix(remount): correct usrLibMultiarchDir value for 32-bit ARM --- internal/ebutil/libs_arm.go | 5 +++-- internal/ebutil/remount_internal_test.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/ebutil/libs_arm.go b/internal/ebutil/libs_arm.go index 7c015b42..f73e3c44 100644 --- a/internal/ebutil/libs_arm.go +++ b/internal/ebutil/libs_arm.go @@ -2,5 +2,6 @@ package ebutil -// Based on a 32-bit Raspbian system. -const usrLibMultiarchDir = "/usr/lib/arm-linux-gnueabihf" +// This constant is for 64-bit systems. 32-bit ARM is not supported. +// If ever it becomes supported, it should be handled with a `usrLib32MultiarchDir` constant. +const usrLibMultiarchDir = "/var/empty" diff --git a/internal/ebutil/remount_internal_test.go b/internal/ebutil/remount_internal_test.go index ceb0bff3..fe44728e 100644 --- a/internal/ebutil/remount_internal_test.go +++ b/internal/ebutil/remount_internal_test.go @@ -18,6 +18,7 @@ import ( var expectedLibMultiarchDir = map[string]string{ "amd64": "/usr/lib/x86_64-linux-gnu", + "arm": "/var/empty", "arm64": "/usr/lib/aarch64-linux-gnu", }