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

fix(url-lib): shellcheck for modules.d/45url-lib

master
Harald Hoyer 4 years ago committed by Harald Hoyer
parent
8df14af245
commit
8e84fa7262
3 changed files with 49 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      modules.d/45url-lib/.shchkdir
  2. 44
      modules.d/45url-lib/module-setup.sh
  3. 48
      modules.d/45url-lib/url-lib.sh

0
modules.d/45url-lib/.shchkdir
Unescape View File

44
modules.d/45url-lib/module-setup.sh
Unescape View File

@ -15,7 +15,7 @@ depends() {


# called by dracut # called by dracut
install() { install() {
local _dir _crt _found _lib _nssckbi _p11roots _p11root _p11item local _dir _crt _found _lib _nssckbi _p11roots _p11root
inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh" inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
inst_multiple -o ctorrent inst_multiple -o ctorrent
inst_multiple curl inst_multiple curl
@ -29,10 +29,12 @@ install() {


for _dir in $libdirs; do for _dir in $libdirs; do
[[ -d $dracutsysrootdir$_dir ]] || continue [[ -d $dracutsysrootdir$_dir ]] || continue
for _lib in $dracutsysrootdir$_dir/libcurl.so.*; do for _lib in "$dracutsysrootdir$_dir"/libcurl.so.*; do
[[ -e $_lib ]] || continue [[ -e $_lib ]] || continue
[[ $_nssckbi ]] || _nssckbi=$(grep -F --binary-files=text -z libnssckbi $_lib) if ! [[ $_nssckbi ]]; then
_crt=$(grep -F --binary-files=text -z .crt $_lib) read -r -d '' _nssckbi < <(grep -F --binary-files=text -z libnssckbi "$_lib")
fi
read -r -d '' _crt < <(grep -F --binary-files=text -z .crt "$_lib")
[[ $_crt ]] || continue [[ $_crt ]] || continue
[[ $_crt == /*/* ]] || continue [[ $_crt == /*/* ]] || continue
if ! inst "${_crt#$dracutsysrootdir}"; then if ! inst "${_crt#$dracutsysrootdir}"; then
@ -53,26 +55,26 @@ install() {
for _dir in $libdirs; do for _dir in $libdirs; do
[[ -e $dracutsysrootdir$_dir/libnssckbi.so ]] || continue [[ -e $dracutsysrootdir$_dir/libnssckbi.so ]] || continue
# this looks for directory-ish strings in the file # this looks for directory-ish strings in the file
for _p11roots in $(grep -o --binary-files=text "/[[:alpha:]][[:print:]]*" $dracutsysrootdir$_dir/libnssckbi.so); do grep -z -o --binary-files=text '/[[:alpha:]][[:print:]]*' "${dracutsysrootdir}${_dir}"/libnssckbi.so \
# the string can be a :-separated list of dirs | while read -r -d '' _p11roots || [[ $_p11roots ]]; do
for _p11root in $(echo "$_p11roots" | tr ':' '\n'); do IFS=":" read -r -a _p11roots <<< "$_p11roots"
# check if it's actually a directory (there are # the string can be a :-separated list of dirs
# several false positives in the results) for _p11root in "${_p11roots[@]}"; do
[[ -d "$dracutsysrootdir$_p11root" ]] || continue # check if it's actually a directory (there are
# check if it has some specific subdirs that all # several false positives in the results)
# p11-kit trust dirs have [[ -d "$dracutsysrootdir$_p11root" ]] || continue
[[ -d "$dracutsysrootdir${_p11root}/anchors" ]] || continue # check if it has some specific subdirs that all
[[ -d "$dracutsysrootdir${_p11root}/blacklist" ]] || continue # p11-kit trust dirs have
# so now we know it's really a p11-kit trust dir; [[ -d "$dracutsysrootdir${_p11root}/anchors" ]] || continue
# install everything in it [[ -d "$dracutsysrootdir${_p11root}/blacklist" ]] || continue
for _p11item in $(find "$dracutsysrootdir$_p11root"); do # so now we know it's really a p11-kit trust dir;
if ! inst "${_p11item#$dracutsysrootdir}"; then # install everything in it
dwarn "Couldn't install '${_p11item#$dracutsysrootdir}' from p11-kit trust dir '${_p11root#$dracutsysrootdir}'; HTTPS might not work." mkdir -p -- "${initdir}/${_p11root}"
continue if ! $DRACUT_CP -L -t "${initdir}/${_p11root}" "${dracutsysrootdir}${_p11root}"/*; then
dwarn "Couldn't install from p11-kit trust dir '${_p11root#$dracutsysrootdir}'; HTTPS might not work."
fi fi
done done
done done
done
done done
fi fi
[[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle or libnssckbi.so; HTTPS won't work." [[ $_found ]] || dwarn "Couldn't find SSL CA cert bundle or libnssckbi.so; HTTPS won't work."

48
modules.d/45url-lib/url-lib.sh
Unescape View File

@ -20,7 +20,8 @@ type mkuniqdir > /dev/null 2>&1 || . /lib/dracut-lib.sh
# other: fetch command failure (whatever curl/mount/etc return) # other: fetch command failure (whatever curl/mount/etc return)
fetch_url() { fetch_url() {
local url="$1" outloc="$2" local url="$1" outloc="$2"
local handler="$(get_url_handler $url)" local handler
handler="$(get_url_handler "$url")"
[ -n "$handler" ] || return 254 [ -n "$handler" ] || return 254
[ -n "$url" ] || return 255 [ -n "$url" ] || return 255
"$handler" "$url" "$outloc" "$handler" "$url" "$outloc"
@ -41,14 +42,14 @@ get_url_handler() {
add_url_handler() { add_url_handler() {
local handler="$1" local handler="$1"
shift shift
local schemes="$@" scheme="" local schemes="$*" scheme=""
set -- set --
for scheme in $schemes; do for scheme in $schemes; do
[ "$(get_url_handler $scheme)" = "$handler" ] && continue [ "$(get_url_handler "$scheme")" = "$handler" ] && continue
set -- "$@" "$scheme:$handler" set -- "$@" "$scheme:$handler"
done done
set -- "$@" $url_handler_map # add new items to *front* of list set -- "$@" "$url_handler_map" # add new items to *front* of list
url_handler_map="$@" url_handler_map="$*"
} }


### HTTP, HTTPS, FTP ################################################# ### HTTP, HTTPS, FTP #################################################
@ -65,14 +66,15 @@ curl_fetch_url() {
local url="$1" outloc="$2" local url="$1" outloc="$2"
echo "$url" > /proc/self/fd/0 echo "$url" > /proc/self/fd/0
if [ -n "$outloc" ]; then if [ -n "$outloc" ]; then
curl $curl_args --output - -- "$url" > "$outloc" || return $? curl "$curl_args" --output - -- "$url" > "$outloc" || return $?
else else
local outdir="$(mkuniqdir /tmp curl_fetch_url)" local outdir
outdir="$(mkuniqdir /tmp curl_fetch_url)"
( (
cd "$outdir" cd "$outdir" || exit
curl $curl_args --remote-name "$url" || return $? curl "$curl_args" --remote-name "$url" || return $?
) )
outloc="$outdir/$(ls -A $outdir)" outloc="$outdir/$(ls -A "$outdir")"
fi fi
if ! [ -f "$outloc" ]; then if ! [ -f "$outloc" ]; then
warn "Downloading '$url' failed!" warn "Downloading '$url' failed!"
@ -96,21 +98,22 @@ ctorrent_fetch_url() {
torrent_outloc="$outloc.torrent" torrent_outloc="$outloc.torrent"
echo "$url" > /proc/self/fd/0 echo "$url" > /proc/self/fd/0
if [ -n "$outloc" ]; then if [ -n "$outloc" ]; then
curl $curl_args --output - -- "$url" > "$torrent_outloc" || return $? curl "$curl_args" --output - -- "$url" > "$torrent_outloc" || return $?
else else
local outdir="$(mkuniqdir /tmp torrent_fetch_url)" local outdir
outdir="$(mkuniqdir /tmp torrent_fetch_url)"
( (
cd "$outdir" cd "$outdir" || exit
curl $curl_args --remote-name "$url" || return $? curl "$curl_args" --remote-name "$url" || return $?
) )
torrent_outloc="$outdir/$(ls -A $outdir)" torrent_outloc="$outdir/$(ls -A "$outdir")"
outloc=${torrent_outloc%.*} outloc=${torrent_outloc%.*}
fi fi
if ! [ -f "$torrent_outloc" ]; then if ! [ -f "$torrent_outloc" ]; then
warn "Downloading '$url' failed!" warn "Downloading '$url' failed!"
return 253 return 253
fi fi
ctorrent $ctorrent_args -s $outloc $torrent_outloc >&2 ctorrent "$ctorrent_args" -s "$outloc" "$torrent_outloc" >&2
if ! [ -f "$outloc" ]; then if ! [ -f "$outloc" ]; then
warn "Torrent download of '$url' failed!" warn "Torrent download of '$url' failed!"
return 253 return 253
@ -126,17 +129,17 @@ command -v ctorrent > /dev/null \
[ -e /lib/nfs-lib.sh ] && . /lib/nfs-lib.sh [ -e /lib/nfs-lib.sh ] && . /lib/nfs-lib.sh


nfs_already_mounted() { nfs_already_mounted() {
local server="$1" path="$2" localdir="" s="" p="" local server="$1" path="$2" s="" p=""
cat /proc/mounts | while read src mnt rest || [ -n "$src" ]; do while read -r src mnt rest || [ -n "$src" ]; do
splitsep ":" "$src" s p splitsep ":" "$src" s p
if [ "$server" = "$s" ]; then if [ "$server" = "$s" ]; then
if [ "$path" = "$p" ]; then if [ "$path" = "$p" ]; then
echo $mnt echo "$mnt"
elif str_starts "$path" "$p"; then elif str_starts "$path" "$p"; then
echo $mnt/${path#$p/} echo "$mnt"/"${path#$p/}"
fi fi
fi fi
done done < /proc/mounts
} }


nfs_fetch_url() { nfs_fetch_url() {
@ -147,7 +150,8 @@ nfs_fetch_url() {
# skip mount if server:/filepath is already mounted # skip mount if server:/filepath is already mounted
mntdir=$(nfs_already_mounted "$server" "$path") mntdir=$(nfs_already_mounted "$server" "$path")
if [ -z "$mntdir" ]; then if [ -z "$mntdir" ]; then
local mntdir="$(mkuniqdir /run nfs_mnt)" local mntdir
mntdir="$(mkuniqdir /run nfs_mnt)"
mount_nfs "$nfs:$server:$filepath${options:+:$options}" "$mntdir" mount_nfs "$nfs:$server:$filepath${options:+:$options}" "$mntdir"
# lazy unmount during pre-pivot hook # lazy unmount during pre-pivot hook
inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l -- "$mntdir" inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l -- "$mntdir"

Write Preview
Loading…
Cancel
Save