From e2759a3e6796b8286b89e04c432dcbc5e20920e4 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 15 Mar 2022 11:03:25 +0100 Subject: [PATCH] build_library/set_lsb_release: create compatibility symlink The os-release file was not only accessible through /usr/lib/ but also through /usr/lib64 because "lib" was just a symlink. Now that we split them up into two directories, add a compatibility symlink in case /usr/lib64 was used to access os-release. A check is added to also work without the split which is useful if the split is not done for the SDK at the same time. --- build_library/set_lsb_release | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release index 17a85184d4..9b71a95907 100755 --- a/build_library/set_lsb_release +++ b/build_library/set_lsb_release @@ -62,6 +62,10 @@ CPE_NAME="cpe:2.3:o:${OS_ID}-linux:${OS_ID}_linux:${FLATCAR_VERSION}:*:*:*:*:*:* EOF sudo ln -sf "../usr/lib/os-release" "${ROOT_FS_DIR}/etc/os-release" sudo ln -sf "../../lib/os-release" "${ROOT_FS_DIR}/usr/share/flatcar/os-release" +# Compat for split of lib64 into lib and lib64 +if [ ! -e "${ROOT_FS_DIR}/usr/lib64/os-release" ]; then + sudo ln -sf "../lib/os-release" "${ROOT_FS_DIR}/usr/lib64/os-release" +fi # Create the defaults for the coreos configuration files in the usr directory sudo_clobber "${ROOT_FS_DIR}/usr/share/flatcar/release" <