From cb37ef5384b7696b11cb0679392608db7ab1001b Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 12 May 2015 17:03:46 +0200 Subject: [PATCH] ramdisk: switch from lsb_release to $DISTRO_NAME Instead of executing `lsb_release` to know the current distro being built, use the $DISTRO_NAME environment variable, already provided by distribution elements. Change-Id: I22b67afb481983cc40c198fd408ad5c7f4d68bec --- lib/ramdisk-functions | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ramdisk-functions b/lib/ramdisk-functions index dcfbb845..f66069c6 100644 --- a/lib/ramdisk-functions +++ b/lib/ramdisk-functions @@ -32,15 +32,15 @@ function create_ramdisk_base () { # cjk adding for discovery support mkdir -p "${TMP_MOUNT_PATH}/"{lib/udev/rules.d,var/{lib/dhcp,run}} - DISTRO=`lsb_release -si` || true - - if [[ "Fedora RedHatEnterpriseServer \"openSUSE project\"" =~ "$DISTRO" ]]; then - mkdir -p "$TMP_MOUNT_PATH/usr" - ln -s ../lib "$TMP_MOUNT_PATH/usr/lib" - if [ "`uname -m`" = "x86_64" ]; then + case "$DISTRO_NAME" in + fedora|rhel|rhel7|opensuse) + mkdir -p "$TMP_MOUNT_PATH/usr" + ln -s ../lib "$TMP_MOUNT_PATH/usr/lib" + if [ "`uname -m`" = "x86_64" ]; then ln -s lib "$TMP_MOUNT_PATH/lib64" - fi - fi + fi + ;; + esac if [ -e $LIB_UDEV/rules.d/50-firmware.rules ]; then cp -a "$LIB_UDEV/rules.d/50-firmware.rules" "$TMP_MOUNT_PATH/lib/udev/rules.d"