From: Harald Hoyer Date: Wed, 9 Nov 2011 12:58:54 +0000 (+0100) Subject: 95iscsi: add iscsiuio X-Git-Tag: 014~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fa9d4d717fa1ff497e0b3824fa34bec9895cc6b;p=platform%2Fupstream%2Fdracut.git 95iscsi: add iscsiuio install iscsiuio start iscsiuio stop iscsiuio before switching root --- diff --git a/modules.d/95iscsi/cleanup-iscsi.sh b/modules.d/95iscsi/cleanup-iscsi.sh new file mode 100755 index 0000000..a2d5951 --- /dev/null +++ b/modules.d/95iscsi/cleanup-iscsi.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh + +[ -e /sys/module/bnx2i ] && killproc iscsiuio + diff --git a/modules.d/95iscsi/iscsiroot b/modules.d/95iscsi/iscsiroot index b1509c2..bcdc046 100755 --- a/modules.d/95iscsi/iscsiroot +++ b/modules.d/95iscsi/iscsiroot @@ -40,6 +40,8 @@ modprobe crc32c 2>/dev/null [ -e /tmp/root.info ] && . /tmp/root.info +[ -e /sys/module/bnx2i ] && iscsiuio + if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then if [ -n "${root%%block:*}" ]; then # if root is not specified try to mount the whole iSCSI LUN diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh index 5d8dc07..8caaf73 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -57,10 +57,12 @@ installkernel() { install() { dracut_install umount + dracut_install -o iscsiuio inst iscsistart inst hostname inst iscsi-iname inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh" + inst_hook pre-pivot 90 "$moddir/cleanup-iscsi.sh" inst "$moddir/iscsiroot" "/sbin/iscsiroot" inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh" }