Browse Source

move ln_r() to dracut-init.sh

master
Harald Hoyer 8 years ago
parent
commit
1901500187
  1. 12
      dracut-functions.sh
  2. 13
      dracut-init.sh

12
dracut-functions.sh

@ -167,18 +167,6 @@ convert_abs_rel() { @@ -167,18 +167,6 @@ convert_abs_rel() {
printf "%s\n" "$__newpath"
}

if [[ "$(ln --help)" == *--relative* ]]; then
ln_r() {
ln -sfnr "${initdir}/$1" "${initdir}/$2"
}
else
ln_r() {
local _source=$1
local _dest=$2
[[ -d "${_dest%/*}" ]] && _dest=$(readlink -f "${_dest%/*}")/${_dest##*/}
ln -sfn -- "$(convert_abs_rel "${_dest}" "${_source}")" "${initdir}/${_dest}"
}
fi

# get_fs_env <device>
# Get and the ID_FS_TYPE variable from udev for a device.

13
dracut-init.sh

@ -997,3 +997,16 @@ instmods() { @@ -997,3 +997,16 @@ instmods() {
[[ "$optional" ]] && return 0
return $_ret
}

if [[ "$(ln --help)" == *--relative* ]]; then
ln_r() {
ln -sfnr "${initdir}/$1" "${initdir}/$2"
}
else
ln_r() {
local _source=$1
local _dest=$2
[[ -d "${_dest%/*}" ]] && _dest=$(readlink -f "${_dest%/*}")/${_dest##*/}
ln -sfn -- "$(convert_abs_rel "${_dest}" "${_source}")" "${initdir}/${_dest}"
}
fi

Loading…
Cancel
Save