root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

allow mode on symlinks

Browse source
This commit is contained in:
Tobias Powalowski 2022-12-01 20:57:51 +01:00
parent cbd3e0d0e4
commit c4f158908e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/share/archboot/patches/33-initcpio.functions.fixed
View file

@ -693,9 +693,10 @@ add_binary() {
# be discovered and added. # be discovered and added.
# $1: path to binary # $1: path to binary
# $2: destination on initcpio (optional, defaults to same as source) # $2: destination on initcpio (optional, defaults to same as source)
# $3: mode
local -a sodeps local -a sodeps
local line= regex= binary= dest= sodep= resolved= local line= regex= binary= dest= mode= sodep= resolved=
if [[ ${1:0:1} != '/' ]]; then if [[ ${1:0:1} != '/' ]]; then
binary=$(type -P "$1") binary=$(type -P "$1")
@ -707,10 +708,13 @@ add_binary() {
error "file not found: \`%s'" "$1" error "file not found: \`%s'" "$1"
return 1 return 1
fi fi
binary="$(realpath -s -- "$binary")"
dest=${2:-$binary} dest=${2:-$binary}
dest="$(realpath -ms -- "$dest")"
mode=${3:-$mode}
add_file "$binary" "$dest" add_file "$binary" "$dest" "$mode"
# negate this so that the RETURN trap is not fired on non-binaries # negate this so that the RETURN trap is not fired on non-binaries
! lddout=$(ldd "$binary" 2>/dev/null) && return 0 ! lddout=$(ldd "$binary" 2>/dev/null) && return 0