On Fri, Aug 17, 2012 at 08:35:21PM +0800, dyoung@xxxxxxxxxx wrote:
> For lvm, multipath, iscsi modules they do not care about the filesystem,
> Also there could be devcie in host_devs but it does not get formated.
>
> For these kind of modules, use for_each_host_dev will be better than use
> for_each_host_dev_fs, here add a new function to iterate the host_devs.
>
If we decide not to add slave devices in host_devs, then this will not
work.
Vivek
> Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
> ---
> dracut-functions.sh | 15 +++++++++++++++
> modules.d/90lvm/module-setup.sh | 2 +-
> modules.d/90multipath/module-setup.sh | 2 +-
> modules.d/95iscsi/module-setup.sh | 2 +-
> 4 files changed, 18 insertions(+), 3 deletions(-)
>
> --- dracut.orig/dracut-functions.sh
> +++ dracut/dracut-functions.sh
> @@ -387,6 +387,21 @@ find_mp_fstype() {
> # finds the major:minor of the block device backing the root filesystem.
> find_root_block_device() { find_block_device /; }
>
> +# for_each_host_dev <func>
> +# Execute "<func> <dev>" for every "<dev>" found
> +# in ${host_devs[@]}
> +for_each_host_dev()
> +{
> + local _func="$1"
> + local _dev
> + local _ret=1
> + for _dev in ${host_devs[@]}; do
> + [[ -b "$_dev" ]] || continue
> + $_func $_dev && _ret=0
> + done
> + return $_ret
> +}
> +
> # for_each_host_dev_fs <func>
> # Execute "<func> <dev> <filesystem>" for every "<dev>|<fs>" pair found
> # in ${host_fs_types[@]}
> --- dracut.orig/modules.d/90lvm/module-setup.sh
> +++ dracut/modules.d/90lvm/module-setup.sh
> @@ -22,7 +22,7 @@ check() {
> }
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs check_lvm || return 1
> + for_each_host_dev check_lvm || return 1
> }
>
> return 0
> --- dracut.orig/modules.d/90multipath/module-setup.sh
> +++ dracut/modules.d/90multipath/module-setup.sh
> @@ -16,7 +16,7 @@ check() {
> }
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs is_mpath || return 1
> + for_each_host_dev is_mpath || return 1
> }
>
> return 0
> --- dracut.orig/modules.d/95iscsi/module-setup.sh
> +++ dracut/modules.d/95iscsi/module-setup.sh
> @@ -23,7 +23,7 @@ check() {
> )
>
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> - for_each_host_dev_fs is_iscsi || return 1
> + for_each_host_dev is_iscsi || return 1
> }
> return 0
> }
--
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
