kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

inst_simple, inst_dir: make fast case faster 

This small stuff saves 1.7% per dropped statement during "dracut --profile".
Fixing the comment about /lib -> lib64 is REQUIRED!
master
John Reiser 2011-08-26 13:01:33 -07:00 committed by Harald Hoyer
parent f063d0e89f
commit 3f590c7840
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dracut-functions
View File

@ -266,19 +266,13 @@ check_vol_slaves() {
} }


# Install a directory, keeping symlinks as on the original system. # Install a directory, keeping symlinks as on the original system.
# Example: if /lib64 points to /lib on the host, "inst_dir /lib/file" # Example: if /lib points to /lib64 on the host, "inst_dir /lib/file"
# will create ${initdir}/lib64, ${initdir}/lib64/file, # will create ${initdir}/lib64, ${initdir}/lib64/file,
# and a symlink ${initdir}/lib -> lib64. # and a symlink ${initdir}/lib -> lib64.
inst_dir() { inst_dir() {
local _file="" [[ -e ${initdir}"$1" ]] && return 0 # already there
local _oldifs="$IFS"
local _part
local _dir="$1"


# fast out local _dir="$1" _part=${_dir%/*} _file
[[ -e ${initdir}$_dir ]] && return 0

_part=${_dir%/*}
while [[ "$_part" != "${_part%/*}" ]] && ! [[ -e "${initdir}${_part}" ]]; do while [[ "$_part" != "${_part%/*}" ]] && ! [[ -e "${initdir}${_part}" ]]; do
_dir="$_part $_dir" _dir="$_part $_dir"
_part=${_part%/*} _part=${_part%/*}
@ -310,9 +304,9 @@ inst_dir() {
# Location of the image dir is assumed to be $initdir # Location of the image dir is assumed to be $initdir
# We never overwrite the target if it exists. # We never overwrite the target if it exists.
inst_simple() { inst_simple() {
local _src target
[[ -f $1 ]] || return 1 [[ -f $1 ]] || return 1
_src=$1 target="${2:-$1}"
local _src=$1 target="${2:-$1}"
if ! [[ -d ${initdir}$target ]]; then if ! [[ -d ${initdir}$target ]]; then
[[ -e ${initdir}$target ]] && return 0 [[ -e ${initdir}$target ]] && return 0
[[ -h ${initdir}$target ]] && return 0 [[ -h ${initdir}$target ]] && return 0