shaba/dracut
1
0
Fork 0
mirror of https://github.com/dracutdevs/dracut.git synced 2024-10-26 16:25:20 +03:00
Code Issues Projects Releases Wiki Activity

dracut: Don't fail at copying files when including directories

Browse Source 
When including a directory, the files were considered in the directory
name which lead to messages like :

cp: failed to access '/var/tmp/initramfs.L9s2zO///init-func': No such file or directory

This patch does make the destdir more explicit and copy files into the
destination directory instead of destdir/filename/
This commit is contained in:
Erwan Velu 2014-12-17 17:04:19 +01:00 committed by Harald Hoyer
parent 3e7a05f2a5
commit 332ecaa900
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dracut.sh
View File

@ -1493,12 +1493,13 @@ while pop include_src src && pop include_target tgt; do
inst $src $tgt
else
ddebug "Including directory: $src"
mkdir -p "${initdir}/${tgt}"
destdir="${initdir}/${tgt}"
mkdir -p "$destdir"
# check for preexisting symlinks, so we can cope with the
# symlinks to $prefix
for i in "$src"/*; do
[[ -e "$i" || -h "$i" ]] || continue
s=${initdir}/${tgt}/${i#$src/}
s=${destdir}/${i#$src/}
if [[ -d "$i" ]]; then
if ! [[ -e "$s" ]]; then
mkdir -m 0755 -p "$s"
@ -1506,7 +1507,7 @@ while pop include_src src && pop include_target tgt; do
fi
cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/*
else
cp --reflink=auto --sparse=auto -fa -t "$s" "$i"
cp --reflink=auto --sparse=auto -fa -t "$destdir" "$i"
fi
done
fi