add derror(), dinfo() and dwarning()
parent
5cb6c761c1
commit
6fac46910c
|
@ -28,6 +28,18 @@ IF_dynamic=""
|
||||||
# Generic substring function. If $2 is in $1, return 0.
|
# Generic substring function. If $2 is in $1, return 0.
|
||||||
strstr() { [[ ! ${1#*$2*} = $1 ]]; }
|
strstr() { [[ ! ${1#*$2*} = $1 ]]; }
|
||||||
|
|
||||||
|
dwarning() {
|
||||||
|
echo "W: $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
dinfo() {
|
||||||
|
echo "I: $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
derror() {
|
||||||
|
echo "E: $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
# $1 = file to copy to ramdisk
|
# $1 = file to copy to ramdisk
|
||||||
# $2 (optional) Name for the file on the ramdisk
|
# $2 (optional) Name for the file on the ramdisk
|
||||||
# Location of the image dir is assumed to be $initdir
|
# Location of the image dir is assumed to be $initdir
|
||||||
|
@ -38,7 +50,7 @@ inst_simple() {
|
||||||
src=$1 target="${initdir}${2:-$1}"
|
src=$1 target="${initdir}${2:-$1}"
|
||||||
[[ -f $target ]] && return 0
|
[[ -f $target ]] && return 0
|
||||||
mkdir -p "${target%/*}"
|
mkdir -p "${target%/*}"
|
||||||
echo "Installing $src" >&2
|
dinfo "Installing $src"
|
||||||
cp -fL "$src" "$target"
|
cp -fL "$src" "$target"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,9 +94,9 @@ inst_binary() {
|
||||||
ldd $bin 2>/dev/null | while read line; do
|
ldd $bin 2>/dev/null | while read line; do
|
||||||
[[ $line = 'not a dynamic executable' ]] && return 1
|
[[ $line = 'not a dynamic executable' ]] && return 1
|
||||||
[[ $line =~ not\ found ]] &&{
|
[[ $line =~ not\ found ]] &&{
|
||||||
echo "Missing a shared library required by $bin." >&2
|
derror "Missing a shared library required by $bin."
|
||||||
echo "Run \"ldd $bin\" to find out what it is." >&2
|
derror "Run \"ldd $bin\" to find out what it is."
|
||||||
echo "dracut cannot create an initrd." >&2
|
derror "dracut cannot create an initrd."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
[[ $line =~ ([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*) ]] || continue
|
[[ $line =~ ([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*) ]] || continue
|
||||||
|
@ -152,7 +164,7 @@ inst_rules() {
|
||||||
# Same args as above.
|
# Same args as above.
|
||||||
inst() {
|
inst() {
|
||||||
if (($# != 1 && $# != 2 )); then
|
if (($# != 1 && $# != 2 )); then
|
||||||
echo "dracut error: inst only takes 1 or 2 arguments"
|
derror "inst only takes 1 or 2 arguments"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
for x in inst_symlink inst_script inst_binary inst_simple; do
|
for x in inst_symlink inst_script inst_binary inst_simple; do
|
||||||
|
@ -166,12 +178,12 @@ inst() {
|
||||||
# All hooks should be POSIX/SuS compliant, they will be sourced by init.
|
# All hooks should be POSIX/SuS compliant, they will be sourced by init.
|
||||||
inst_hook() {
|
inst_hook() {
|
||||||
[[ -f $3 ]] || {
|
[[ -f $3 ]] || {
|
||||||
echo "Cannot install a hook ($3) that does not exist." >&2
|
derror "Cannot install a hook ($3) that does not exist."
|
||||||
echo "Aborting initrd creation." >&2
|
derror "Aborting initrd creation."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
strstr "$hookdirs" "$1" || {
|
strstr "$hookdirs" "$1" || {
|
||||||
echo "No such hook type $1. Aborting initrd creation." >&2
|
derror "No such hook type $1. Aborting initrd creation."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
inst_simple "$3" "/${1}/${2}${3##*/}"
|
inst_simple "$3" "/${1}/${2}${3##*/}"
|
||||||
|
@ -183,7 +195,7 @@ dracut_install() {
|
||||||
shift
|
shift
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
echo "Failed to install $1" >&2 ; exit 1
|
derror "Failed to install $1"; exit 1
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,6 +238,8 @@ instmods() {
|
||||||
for fw in $(/sbin/modinfo -F firmware $mod 2>/dev/null); do
|
for fw in $(/sbin/modinfo -F firmware $mod 2>/dev/null); do
|
||||||
if [ -f /lib/firmware/$fw ]; then
|
if [ -f /lib/firmware/$fw ]; then
|
||||||
inst_simple "/lib/firmware/$fw"
|
inst_simple "/lib/firmware/$fw"
|
||||||
|
else
|
||||||
|
dwarning "Possible missing firmware /lib/firmware/${fw} for module $(basename ${mod} .ko)"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue