On 11/27/2013 04:44 PM, Hannes Reinecke wrote:
> dasd_cio_free is a RedHat-specific tool, so make it optional.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
> ---
> dracut-functions.sh | 9 +++++++++
> modules.d/95dasd_mod/module-setup.sh | 3 ++-
> modules.d/95dasd_mod/parse-dasd-mod.sh | 4 +++-
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/dracut-functions.sh b/dracut-functions.sh
> index 2872516..c2cf67a 100755
> --- a/dracut-functions.sh
> +++ b/dracut-functions.sh
> @@ -741,6 +741,15 @@ inst_multiple() {
> return $ret
> }
>
> +inst_multiple_optional() {
> + local ret
> + #dinfo "initdir=$initdir $DRACUT_INSTALL -l $@"
> + $DRACUT_INSTALL ${initdir:+-D "$initdir"} -o -a ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-H} "$@"
> + ret=$?
> + (($ret != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} -o -a ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-H} "$@" || :
> + return $ret
> +}
> +
Why so complicated and not use "inst_multiple -o" ??
Or, if you prefer inst_multiple_optional, replace all other occurences of
"inst_multiple -o" with inst_multiple_optional also.
> dracut_install() {
> inst_multiple "$@"
> }
> diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh
> index 011010d..4546059 100755
> --- a/modules.d/95dasd_mod/module-setup.sh
> +++ b/modules.d/95dasd_mod/module-setup.sh
> @@ -23,6 +23,7 @@ installkernel() {
> # called by dracut
> install() {
> inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
> - inst_multiple dasd_cio_free grep sed seq
> + inst_multiple grep sed seq
> + inst_multiple_optional dasd_cio_free
> }
>
> diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
> index 87c88ed..0236d12 100755
> --- a/modules.d/95dasd_mod/parse-dasd-mod.sh
> +++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
> @@ -15,4 +15,6 @@ if [ -n "$mod_args" ]; then
> fi
>
> unset dasd_arg
> -dasd_cio_free
> +if [ -x /sbin/dasd_cio_free ] ; then
> + dasd_cio_free
> +fi
>
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
