forked from pool/open-iscsi
Dirk Mueller
30e388ec73
- Remove usage of iscsiuio from mkinitrd scripts - Add programs tags to mkinitrd scripts OBS-URL: https://build.opensuse.org/request/show/202158 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=18
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
---
|
|
etc/mkinitrd/mkinitrd-boot.sh | 6 ++++--
|
|
etc/mkinitrd/mkinitrd-stop.sh | 4 ++--
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
Index: open-iscsi-2.0-873/etc/mkinitrd/mkinitrd-boot.sh
|
|
===================================================================
|
|
--- open-iscsi-2.0-873.orig/etc/mkinitrd/mkinitrd-boot.sh
|
|
+++ open-iscsi-2.0-873/etc/mkinitrd/mkinitrd-boot.sh
|
|
@@ -1,7 +1,10 @@
|
|
#!/bin/bash
|
|
#%stage: device
|
|
#%depends: network
|
|
-#%programs: /sbin/iscsid /sbin/iscsiadm /sbin/iscsiuio
|
|
+#%programs: mkdir
|
|
+#%programs: rm
|
|
+#%programs: /sbin/iscsid
|
|
+#%programs: /sbin/iscsiadm
|
|
#%modules: iscsi_tcp crc32c scsi_transport_iscsi iscsi_ibft bnx2i
|
|
#%if: "$root_iscsi" -o "$TargetAddress"
|
|
#
|
|
@@ -87,7 +90,6 @@ echo "InitiatorName=$InitiatorName" > /e
|
|
unset iSCSI_warning_InitiatorName
|
|
|
|
echo "Starting iSCSI daemon"
|
|
-/sbin/iscsiuio
|
|
/sbin/iscsid -n
|
|
|
|
if [ -d /sys/firmware/ibft/initiator ] ; then
|
|
Index: open-iscsi-2.0-873/etc/mkinitrd/mkinitrd-stop.sh
|
|
===================================================================
|
|
--- open-iscsi-2.0-873.orig/etc/mkinitrd/mkinitrd-stop.sh
|
|
+++ open-iscsi-2.0-873/etc/mkinitrd/mkinitrd-stop.sh
|
|
@@ -2,6 +2,8 @@
|
|
#
|
|
#%stage: setup
|
|
#%provides: killprogs
|
|
+#%programs: kill
|
|
+#%programs: pidof
|
|
#
|
|
#%if: "$root_iscsi"
|
|
#%dontshow
|
|
@@ -19,6 +21,4 @@
|
|
# kill iscsid, will be restarted from the real root
|
|
iscsi_pid=$(pidof iscsid)
|
|
[ "$iscsi_pid" ] && kill -TERM $iscsi_pid
|
|
-# Same goes for iscsiuio
|
|
-iscsiuio_pid=$(pidof iscsiuio)
|
|
[ "$iscsiuio_pid" ] && kill -TERM $iscsiuio_pid
|