On 11/28/2013 01:51 PM, Harald Hoyer wrote:
> 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.
>
Ah. Okay, will be doing it.
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
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
