diff --git a/open-iscsi-2.0-873.patch b/open-iscsi-2.0-873.patch deleted file mode 100644 index d2bce45..0000000 --- a/open-iscsi-2.0-873.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- - 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 diff --git a/open-iscsi-openSUSE-12.3-first-merge.diff.bz2 b/open-iscsi-openSUSE-12.3-first-merge.diff.bz2 index b03cf8e..d40eea9 100644 --- a/open-iscsi-openSUSE-12.3-first-merge.diff.bz2 +++ b/open-iscsi-openSUSE-12.3-first-merge.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c20a5413448f91a51b6005b9ecebac1485a5f8b66004e762e02f9c1c3b2fdf5f -size 5401 +oid sha256:b81334fc4bc824ac09d3797cf5dc78f50f696fbabb6a45dd77b99ab29fe06d37 +size 5484 diff --git a/open-iscsi-openSUSE-Factory-first-merge.diff.bz2 b/open-iscsi-openSUSE-Factory-first-merge.diff.bz2 index df9221e..c3739b7 100644 --- a/open-iscsi-openSUSE-Factory-first-merge.diff.bz2 +++ b/open-iscsi-openSUSE-Factory-first-merge.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48d088abe9f94726e96481b03811935ffc4f5ce58ee40d7a552a7feab7974293 -size 4249 +oid sha256:8c603d89692c2f4589375dd0e41ae2497cdcfde38c249829114b835ff1002a05 +size 6174 diff --git a/open-iscsi-sles11-sp2-latest.diff.bz2 b/open-iscsi-sles11-sp2-latest.diff.bz2 index ba21e2a..62fda40 100644 --- a/open-iscsi-sles11-sp2-latest.diff.bz2 +++ b/open-iscsi-sles11-sp2-latest.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afd88eed2d2f3860f406e1232cbc681a6a3580bba9a8309726ef211c76c4cb61 -size 2551 +oid sha256:4758cbf83f0e7b762ea51e9bbc6c05ad5c717a0a774415ec3df23e99a312dfef +size 2598 diff --git a/open-iscsi-sles11-sp2-update.diff.bz2 b/open-iscsi-sles11-sp2-update.diff.bz2 index 0c0a104..ab299ac 100644 --- a/open-iscsi-sles11-sp2-update.diff.bz2 +++ b/open-iscsi-sles11-sp2-update.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:461b8ce6f45c1cf9f198b4b33bc159d370b0d02eae893c351139268eae52d540 -size 40258 +oid sha256:937c3e6d20549e353f8114f59e182601a10ff6e4a9a92e6c0a326f7282598cbf +size 40793 diff --git a/open-iscsi-sles11-sp3-flash-update.diff.bz2 b/open-iscsi-sles11-sp3-flash-update.diff.bz2 index 0d55b75..47eb11e 100644 --- a/open-iscsi-sles11-sp3-flash-update.diff.bz2 +++ b/open-iscsi-sles11-sp3-flash-update.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e82d577fa79ed506e536b6318364745212cd2a2b530506078f250ac45f59db03 -size 17225 +oid sha256:8534e1ae5fe924b6dd39ff4574d83fd6543daf1801f43107d0bdc0a65d6eacf0 +size 17373 diff --git a/open-iscsi-sles11-sp3-general-updates-1.diff.bz2 b/open-iscsi-sles11-sp3-general-updates-1.diff.bz2 index 7df481a..f86ebd0 100644 --- a/open-iscsi-sles11-sp3-general-updates-1.diff.bz2 +++ b/open-iscsi-sles11-sp3-general-updates-1.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:041f180b007883ee4a156ddae70998d8818ef46b684d0b8cd32b68dec769ac19 -size 6522 +oid sha256:0eec47cdb410022d115b454ee1b4c2df1466753b713cc5964baacd25ee01447f +size 6568 diff --git a/open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 b/open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 index 46b90e1..81467a5 100644 --- a/open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 +++ b/open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0c6f2a84a9a11d909f835cf5a5c50f9ac7030e8d20d72f6b44b949d0fdf1fc1 -size 881 +oid sha256:9e092d2fdee84668b5a65faca69cf1be065edc05861098d77725b534fa29c8f3 +size 893 diff --git a/open-iscsi.changes b/open-iscsi.changes index 5fdc723..71ed06a 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Nov 14 22:59:40 UTC 2013 - crrodriguez@opensuse.org -- install the iscsistart utility which is required by dracut +- install the iscsistart utility which is required by dracut ------------------------------------------------------------------- Fri Oct 4 16:07:47 CEST 2013 - ohering@suse.de diff --git a/open-iscsi.spec b/open-iscsi.spec index 20546d8..aa5b2f9 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -43,7 +43,6 @@ Patch4: %{name}-sles11-sp3-flash-update.diff.bz2 Patch5: %{name}-sles11-sp3-general-updates-1.diff.bz2 Patch6: %{name}-openSUSE-12.3-first-merge.diff.bz2 Patch7: %{name}-openSUSE-Factory-first-merge.diff.bz2 -Patch10: open-iscsi-2.0-873.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,7 +79,6 @@ Authors: %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch10 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user