Accepting request 49879 from network

Copy from network/open-iscsi based on submit request 49879 from user coolo

OBS-URL: https://build.opensuse.org/request/show/49879
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=21
This commit is contained in:
OBS User autobuild 2010-10-06 20:46:20 +00:00 committed by Git OBS Bridge
parent 156fcf6f48
commit 6026716148
3 changed files with 16 additions and 13 deletions

View File

@ -1,6 +1,9 @@
diff --git a/etc/mkinitrd/mkinitrd-boot.sh b/etc/mkinitrd/mkinitrd-boot.sh ---
new file mode 100644 etc/mkinitrd/mkinitrd-boot.sh | 95 +++++++++++++++++++++++++++++++++++++++++
index 0000000..9bd22ff etc/mkinitrd/mkinitrd-setup.sh | 70 ++++++++++++++++++++++++++++++
etc/mkinitrd/mkinitrd-stop.sh | 21 +++++++++
3 files changed, 186 insertions(+)
--- /dev/null --- /dev/null
+++ b/etc/mkinitrd/mkinitrd-boot.sh +++ b/etc/mkinitrd/mkinitrd-boot.sh
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
@ -8,7 +11,7 @@ index 0000000..9bd22ff
+#%stage: device +#%stage: device
+#%depends: network +#%depends: network
+#%programs: /sbin/iscsid /sbin/iscsiadm +#%programs: /sbin/iscsid /sbin/iscsiadm
+#%modules: iscsi_tcp crc32c scsi_transport_iscsi iscsi_ibft +#%modules: iscsi_tcp crc32c scsi_transport_iscsi
+#%if: "$root_iscsi" -o "$TargetAddress" +#%if: "$root_iscsi" -o "$TargetAddress"
+# +#
+##### iSCSI initialization +##### iSCSI initialization
@ -99,9 +102,6 @@ index 0000000..9bd22ff
+ +
+# Activate all 'onboot' sessions +# Activate all 'onboot' sessions
+/sbin/iscsiadm -m node -L onboot +/sbin/iscsiadm -m node -L onboot
diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh
new file mode 100644
index 0000000..51a22d3
--- /dev/null --- /dev/null
+++ b/etc/mkinitrd/mkinitrd-setup.sh +++ b/etc/mkinitrd/mkinitrd-setup.sh
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
@ -175,9 +175,6 @@ index 0000000..51a22d3
+ +
+save_var TargetPort 3260 # in case the port was not defined via command line we assign a default port +save_var TargetPort 3260 # in case the port was not defined via command line we assign a default port
+ +
diff --git a/etc/mkinitrd/mkinitrd-stop.sh b/etc/mkinitrd/mkinitrd-stop.sh
new file mode 100644
index 0000000..c87073f
--- /dev/null --- /dev/null
+++ b/etc/mkinitrd/mkinitrd-stop.sh +++ b/etc/mkinitrd/mkinitrd-stop.sh
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 12 18:05:27 CET 2010 - mmarek@suse.cz
- Do not hardcode the iscsi_ibft module in the iscsi mkinitrd
script, the ibft script handles this correctly (bnc#528657).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 3 19:09:35 UTC 2009 - coolo@novell.com Tue Nov 3 19:09:35 UTC 2009 - coolo@novell.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package open-iscsi (Version 2.0.870) # spec file for package open-iscsi (Version 2.0.870)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,12 +21,12 @@
Name: open-iscsi Name: open-iscsi
BuildRequires: bison db-devel flex BuildRequires: bison db-devel flex
Url: http://www.open-iscsi.org Url: http://www.open-iscsi.org
License: GPL v2 or later License: GPLv2+
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on AutoReqProv: on
Version: 2.0.870 Version: 2.0.870
Release: 28 Release: 35
Provides: linux-iscsi Provides: linux-iscsi
Obsoletes: linux-iscsi Obsoletes: linux-iscsi
%define iscsi_release 865 %define iscsi_release 865