Merge "Add needed symlink for Fedora deployment ramdisk."

This commit is contained in:
Jenkins 2013-07-28 19:58:58 +00:00 committed by Gerrit Code Review
commit 1146fe63fc
2 changed files with 10 additions and 15 deletions

View File

@ -1,15 +0,0 @@
#!/bin/bash
set -e
[ -n "$TARGET_ROOT" ]
DISTRO=`lsb_release -si` || true
if [[ "Fedora RedHatEnterpriseServer" =~ "$DISTRO" ]]; then
mkdir -p "$TARGET_ROOT/usr"
ln -s ../lib "$TARGET_ROOT/usr/lib"
if [ "`uname -m`" = "x86_64" ]; then
ln -s lib "$TARGET_ROOT/lib64"
fi
fi

View File

@ -43,6 +43,16 @@ function create_ramdisk_base () {
mkdir -p "$TMP_MOUNT_PATH/var/run" mkdir -p "$TMP_MOUNT_PATH/var/run"
mkdir -p "$TMP_MOUNT_PATH/lib/udev/rules.d" mkdir -p "$TMP_MOUNT_PATH/lib/udev/rules.d"
DISTRO=`lsb_release -si` || true
if [[ "Fedora RedHatEnterpriseServer" =~ "$DISTRO" ]]; then
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
if [ -e $LIB_UDEV/rules.d/50-firmware.rules ]; then 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" cp -a "$LIB_UDEV/rules.d/50-firmware.rules" "$TMP_MOUNT_PATH/lib/udev/rules.d"
fi fi