On Fri, Aug 17, 2012 at 08:35:20PM +0800, dyoung@xxxxxxxxxx wrote:
> each dev in host_devs[] should be waited in initqueue to make sure they
> are oneline before initqueue finish.
>
> Add a new wait_host_devs.sh in base module to make this a generic thing.
> Because all the devs in fstab lines are also added to host_devs, so no need
> do same wait in fstab-sys module anymore.
>
> Chaowang: add slave devices to host_devs as well.
Why should we wait for slave devices? If slave device does not come up,
top level device will not come up anyway. So I don't think we should wait
for slave devices.
Secondly, trying to list slave devices is dangerous as the names you
seem to be stroing are not persistent and device renaming will hang
the system.
So whereever you are waiting for a device to come up, make sure you
are using persistent device name as generated by udev.
Thanks
Vivek
>
> Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
> ---
> dracut.sh | 19 +++++++++++++++++++
> modules.d/95fstab-sys/module-setup.sh | 1 -
> modules.d/95fstab-sys/wait-mount-dev.sh | 22 ----------------------
> modules.d/99base/module-setup.sh | 1 +
> modules.d/99base/wait-host-devs.sh | 20 ++++++++++++++++++++
> 5 files changed, 40 insertions(+), 23 deletions(-)
>
> --- dracut.orig/dracut.sh
> +++ dracut/dracut.sh
> @@ -769,6 +769,20 @@ for dev in "${host_devs[@]}"; do
> done
> done
>
> +_get_block_dev() {
> + echo `readlink -f /dev/block/$1`; return 1;
> +}
> +
> +for dev in "${host_devs[@]}"; do
> + unset _dev
> + for _dev in $(check_block_and_slaves _get_block_dev $(get_maj_min $dev)); do
> + [ -b "$_dev" ] || continue
> + if ! strstr " ${host_devs[*]} " " $_dev ";then
> + push host_devs "$_dev"
> + fi
> + done
> +done
> +
> [[ -d $udevdir ]] \
> || udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null)
> if ! [[ -d "$udevdir" ]]; then
> @@ -903,6 +917,11 @@ done
>
> dinfo "*** Including modules done ***"
>
> +## save host_devs which we need bring up
> +for _dev in ${host_devs[@]}; do
> + echo $_dev >> $initdir/etc/host_devs
> +done
> +
> ## final stuff that has to happen
> if [[ $no_kernel != yes ]]; then
>
> --- dracut.orig/modules.d/95fstab-sys/module-setup.sh
> +++ dracut/modules.d/95fstab-sys/module-setup.sh
> @@ -13,5 +13,4 @@ depends() {
> install() {
> [ -f /etc/fstab.sys ] && inst_simple /etc/fstab.sys
> inst_hook pre-pivot 00 "$moddir/mount-sys.sh"
> - inst_hook cmdline 00 "$moddir/wait-mount-dev.sh"
> }
> --- dracut.orig/modules.d/95fstab-sys/wait-mount-dev.sh
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -#!/bin/sh
> -# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
> -# ex: ts=8 sw=4 sts=4 et filetype=sh
> -
> -type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
> -type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
> -
> -fstab_wait_dev() {
> - local _dev _mp _fs _opts _dump _pass _rest
> - test -e "$1" || return 1
> - while read _dev _mp _fs _opts _dump _pass _rest; do
> - [ -z "${_dev%%#*}" ] && continue # Skip comment lines
> - case "$_dev" in
> - /dev/?*)
> - wait_for_dev $_dev;;
> - *) ;;
> - esac
> - done < $1
> - return 0
> -}
> -
> -[ -f /etc/fstab ] && fstab_wait_dev /etc/fstab
> --- dracut.orig/modules.d/99base/module-setup.sh
> +++ dracut/modules.d/99base/module-setup.sh
> @@ -41,6 +41,7 @@ install() {
> dracut_install switch_root || dfatal "Failed to install switch_root"
>
> inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
> + inst_hook cmdline 00 "$moddir/wait-host-devs.sh"
> inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
> mkdir -p "${initdir}/var"
> [ -x /lib/systemd/systemd-timestamp ] && inst /lib/systemd/systemd-timestamp
> --- /dev/null
> +++ dracut/modules.d/99base/wait-host-devs.sh
> @@ -0,0 +1,20 @@
> +#!/bin/sh
> +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
> +# ex: ts=8 sw=4 sts=4 et filetype=sh
> +
> +type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
> +
> +wait_host_devs() {
> + local _dev
> +
> + while read _dev; do
> + case "$_dev" in
> + /dev/?*)
> + wait_for_dev $_dev
> + ;;
> + *) ;;
> + esac
> + done < $1
> +}
> +
> +[ -f /etc/host_devs ] && wait_host_devs /etc/host_devs
--
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
