Shawn Dunn
4698529be5
OBS-URL: https://build.opensuse.org/request/show/222207 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=98
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
Index: dracut-036/modules.d/95iscsi/cleanup-iscsi.sh
|
|
===================================================================
|
|
--- dracut-036.orig/modules.d/95iscsi/cleanup-iscsi.sh 2014-01-29 08:35:47.000000000 +0100
|
|
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
@@ -1,6 +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
|
|
-
|
|
-[ -e /sys/module/bnx2i ] && killproc iscsiuio
|
|
-
|
|
Index: dracut-036/modules.d/95iscsi/iscsiroot.sh
|
|
===================================================================
|
|
--- dracut-036.orig/modules.d/95iscsi/iscsiroot.sh 2014-01-29 08:35:47.000000000 +0100
|
|
+++ dracut-036/modules.d/95iscsi/iscsiroot.sh 2014-02-12 18:15:20.665867839 +0100
|
|
@@ -38,11 +38,6 @@ iroot=${iroot#:}
|
|
# figured out a way how to check whether this is built-in or not
|
|
modprobe crc32c 2>/dev/null
|
|
|
|
-if [ -e /sys/module/bnx2i ] && ! [ -e /tmp/iscsiuio-started ]; then
|
|
- iscsiuio
|
|
- > /tmp/iscsiuio-started
|
|
-fi
|
|
-
|
|
handle_firmware()
|
|
{
|
|
if ! [ -e /tmp/iscsistarted-firmware ]; then
|
|
Index: dracut-036/modules.d/95iscsi/module-setup.sh
|
|
===================================================================
|
|
--- dracut-036.orig/modules.d/95iscsi/module-setup.sh 2014-01-29 08:35:47.000000000 +0100
|
|
+++ dracut-036/modules.d/95iscsi/module-setup.sh 2014-02-13 12:02:51.466789941 +0100
|
|
@@ -81,9 +81,7 @@ installkernel() {
|
|
# called by dracut
|
|
install() {
|
|
inst_multiple umount iscsistart hostname iscsi-iname
|
|
- inst_multiple -o iscsiuio
|
|
inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
|
|
- inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
|
|
inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
|
|
if ! dracut_module_included "systemd"; then
|
|
inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
|