commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2017-04-28 09:12:32
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Fri Apr 28 09:12:32 2017 rev:13 rq:489643 version:4.1
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2016-08-12
15:43:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2017-04-28
09:12:33.412398068 +0200
@@ -1,0 +2,13 @@
+Thu Apr 20 09:34:53 UTC 2017 - jeng...@inai.de
+
+- Drop author lists, they do not count as description.
+- Replace old $RPM_ shell variables by macros for visual
+ consistency.
+
+---
+Thu Apr 13 17:08:58 UTC 2017 - ldun...@suse.com
+
+- Updated SPEC file description of lio-mibs
+ sub-package (bsc#1031855). No functional change.
+
+---
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.AREuk5/_old 2017-04-28 09:12:37.179866806 +0200
+++ /var/tmp/diff_new_pack.AREuk5/_new 2017-04-28 09:12:37.179866806 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lio-utils
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,12 @@
#
-Summary:Linux-iSCSI.org Target Userspace utils
-License:GPL-2.0+
-Group: System/Kernel
-
Name: lio-utils
Version:4.1
Release:0
+Summary:Linux-iSCSI.org Target Userspace utils
+License:GPL-2.0+
+Group: System/Kernel
Url:http://linux-iscsi.org/index.php/Lio-utils
Source: lio-utils-4.1.tar.bz2
Source1:target.service
@@ -111,11 +110,6 @@
setup a number of different subsystem storage object backstores for
LIO LUN endpoints.
-
-Authors:
-
-Nicholas Bellinger
-
%package -n lio-mibs
Summary:Linux-iSCSI.org Target Userspace utils
Group: System/Kernel
@@ -123,26 +117,17 @@
Requires: net-snmp
%description -n lio-mibs
-lio-utils provide a simple low-level configuration tool
-set for LIO.
-
-lio-utils use the configFS kernel API that is available with LIO, which
-provides a clean interface for controlling the kernel level Target
-engine and its fabric module subsystems. lio-utils require LIO 3 or
-higher, and provide iSCSI target functionality on a number of Linux
-baremetal and virtualized systems.
+lio-mibs add SNMP support to the lio-utils package.
-The lio-utils HOWTO gives a good idea of how lio-utils (tcm_node and
-lio_node) CLI operations look like. It is based on the lio-core-2.6.git
-tree for Linux kernel v2.6.30. The LIO User's Reference Manual contains
-detailed operating instructions. It also describes how to setup a
-number of different subsystem storage object backstores for LIO LUN
-endpoints.
+See the lio-utils package description for an overview.
+The following standard MIBs are supported:
-Authors:
-
-Nicholas Bellinger
+MIB Files IETF Drafts Level of Support
+
+LIO-ISCSI-MIB.txt draft-ietf-ips-iscsi-mib-11.txt Full support
+LIO-IPS-AUTH-MIB.txtdraft-ietf-ips-auth-mib-08.txt Partial support
+LIO-SCSI-MIB.txtRFC 4455Partial support
%prep
%setup
@@ -206,49 +191,49 @@
%patch42 -p1
%build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="%{optflags}"
%install
%define _vardir /var/target
-install -vD %{S:1}
${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/target
-mkdir -p $RPM_BUILD_ROOT%{_vardir}
-mkdir $RPM_BUILD_ROOT%{_vardir}/pr
-mkdir $RPM_BUILD_ROOT%{_vardir}/alua
-mkdir $RPM_BUILD_ROOT%{_vardir}/fabric
-mkdir $RPM_BUILD_ROOT%{_vardir}/policy
+install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/target
+mkdir -p %{buildroot}/%{_vardir}
+mkdir %{buildroot}/%{_vardir}/pr
+mkdir %{buildroot}/%{_vardir}/alua
+mkdir %{buildroot}/%{_vardir}/fabric
+mkdir %{buildroot}/%{_vardir}/policy
-mkdir -p $RPM_BUILD_ROOT/etc/target
-echo "#!/bin/bash" > $RPM_BUILD_ROOT/etc/target/tcm_start.sh
+mkdir -p %{buildroot}/etc/target
+echo "#!/bin/bash" >%{buildroot}/etc/target/tcm_start.sh
for mod in target_core_mod target_core_file target_core_iblock
target_core_pscsi ; do
- echo "modprobe $mod" >> $RPM_BUILD_ROOT/etc/target/tcm_start.sh
+ ech
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2016-08-12 15:43:18
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2016-08-05
18:17:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2016-08-12
15:43:26.0 +0200
@@ -1,0 +2,29 @@
+Fri Aug 5 14:12:23 UTC 2016 - apla...@suse.com
+
+- Updated to latest from SLE 12, adding:
+ * Wait for sysconfig to mount when loading iscsi_target_mod module
+(bsc#910721)
+(original author: ldun...@suse.com)
+ * Convert user-input of an empty string to the explicit 4-letter
+string "NULL", when writing sysfs string attributes, such as
+userid and password (bsc#919474), adding:
+* lio-utils-fix-empty-attribute-string-writes.patch
+(original author: ldun...@suse.com)
+ * Added retrying 5 times if first attempt to enable a new target
+fails, which can happen on a fast multiprocessor system
+(bsc#940636), adding:
+* lio-utils-retry-enabling-fileio-target.patch
+(original author: ldun...@suse.com)
+ * when dumping lio state, do not consider it an error if there is no
+target directory, since that can mean there are no targets
+(bsc#934521), adding:
+* lio-utils-dump-skeleton-file-when-no-targets.patch
+(original author: ldun...@suse.com)
+ * Restore configuration from saved file, at startup (bsc#950990),
+adding patch:
+* lio-utils-init-script-restore-config.patch
+(original author: ldun...@suse.com)
+ * Converted /usr/sbin to %_sbin in spec file
+(original author: ldun...@suse.com)
+
+---
New:
lio-utils-dump-skeleton-file-when-no-targets.patch
lio-utils-fix-empty-attribute-string-writes.patch
lio-utils-init-script-restore-config.patch
lio-utils-retry-enabling-fileio-target.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.NtJyUO/_old 2016-08-12 15:43:27.0 +0200
+++ /var/tmp/diff_new_pack.NtJyUO/_new 2016-08-12 15:43:27.0 +0200
@@ -89,6 +89,10 @@
Patch36:lio-utils-update-HOWTO-for-systemd.patch
Patch37:lio-utils-dont-use-U64-from-net-snmp.patch
Patch38:tcm_fabric-Ignore-dbroot-file.patch
+Patch39:lio-utils-fix-empty-attribute-string-writes.patch
+Patch40:lio-utils-retry-enabling-fileio-target.patch
+Patch41:lio-utils-dump-skeleton-file-when-no-targets.patch
+Patch42:lio-utils-init-script-restore-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -196,6 +200,10 @@
%patch36 -p1
%patch37 -p1
%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
@@ -218,6 +226,7 @@
chmod 755 $RPM_BUILD_ROOT/etc/target/tcm_start.sh
echo "#!/bin/bash" > $RPM_BUILD_ROOT/etc/target/lio_start.sh
echo "modprobe iscsi_target_mod" >> $RPM_BUILD_ROOT/etc/target/lio_start.sh
+echo "udevadm settle -t 3 -E /sys/kernel/config/target" >>
$RPM_BUILD_ROOT/etc/target/lio_start.sh
chmod 755 $RPM_BUILD_ROOT/etc/target/lio_start.sh
(cd tcm-py; python setup.py install --prefix=%{_prefix} --root=%{buildroot})
(cd lio-py; python setup.py install --prefix=%{_prefix} --root=%{buildroot})
@@ -281,11 +290,11 @@
%dir %{_vardir}/alua
%dir %{_vardir}/fabric
%dir %{_vardir}/policy
-/usr/sbin/iscsi-name
-/usr/sbin/tcm_*
-/usr/sbin/lio_node
-/usr/sbin/lio_dump
-/usr/sbin/rctarget
+%{_sbindir}/iscsi-name
+%{_sbindir}/tcm_*
+%{_sbindir}/lio_node
+%{_sbindir}/lio_dump
+%{_sbindir}/rctarget
%{python_sitelib}/*
%doc lio-utils.HOWTO
/usr/sbin/target_status
++ lio-utils-dump-skeleton-file-when-no-targets.patch ++
From: Lee Duncan
Date: Fri Nov 20 15:24:01 PST 2015
Subject: dump skeleton file when no targets
Reference: bsc#934521
When there is not target directory go ahead and
dump an empty skeleton target, since this happens
if there are no targets configured.
signed-off-by: Lee Duncan
---
---
lio-py/lio_dump.py | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/lio-py/lio_dump.py
+++ b/lio-py/lio_dump.py
@@ -10,18 +10,18 @@ lio_root = "/sys/kernel/config/target/is
def lio_target_configfs_dump(option, opt_str, value, parser):
- if not os.path.isdir(lio_root):
- print "Unable to access lio_root: " + lio_root
- sys.exit(1)
-
- iqn_root = os.listdir(lio_root)
-
# Add proper shell header
print "#!/bin/bash"
# This will load up iscsi_target_mod.ko
print "mkdir
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2016-08-05 18:17:33
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2016-06-07
23:47:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2016-08-05
18:17:36.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 3 13:36:26 UTC 2016 - apla...@suse.com
+
+- Fix bsc#991931 ignoring dbroot file
+ * tcm_fabric-Ignore-dbroot-file.patch
+
+---
New:
tcm_fabric-Ignore-dbroot-file.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.cSyeid/_old 2016-08-05 18:17:38.0 +0200
+++ /var/tmp/diff_new_pack.cSyeid/_new 2016-08-05 18:17:38.0 +0200
@@ -88,6 +88,7 @@
Patch35:lio-utils-fix-systemd-service-start.patch
Patch36:lio-utils-update-HOWTO-for-systemd.patch
Patch37:lio-utils-dont-use-U64-from-net-snmp.patch
+Patch38:tcm_fabric-Ignore-dbroot-file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -194,6 +195,7 @@
%patch35 -p1
%patch36 -p1
%patch37 -p1
+%patch38 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
++ tcm_fabric-Ignore-dbroot-file.patch ++
Index: lio-utils-4.1/tcm-py/tcm_fabric.py
===
--- lio-utils-4.1.orig/tcm-py/tcm_fabric.py
+++ lio-utils-4.1/tcm-py/tcm_fabric.py
@@ -309,6 +309,8 @@ def fabric_backup_to_file_all(date_time)
# FIXME: currently using lio_dump
if fabric_name == "iscsi":
continue
+ if fabric_name == "dbroot":
+ continue
fabric_root = target_root + fabric_name
# print "Using fabric_backup_to_file: " + date_time + ", " +
fabric_name + ", " + fabric_root
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2016-06-07 23:47:41
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2016-05-19
12:15:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2016-06-07
23:47:42.0 +0200
@@ -1,0 +2,8 @@
+Wed Jun 1 17:51:44 UTC 2016 - ldun...@suse.com
+
+- Fix build issue: Do not use net-snmp U64 type, since
+ net-snmp removed it because of conflicts with other
+ packages, adding patch:
+ * lio-utils-dont-use-U64-from-net-snmp.patch
+
+---
New:
lio-utils-dont-use-U64-from-net-snmp.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.y1U3fU/_old 2016-06-07 23:47:43.0 +0200
+++ /var/tmp/diff_new_pack.y1U3fU/_new 2016-06-07 23:47:43.0 +0200
@@ -87,6 +87,7 @@
Patch34:lio-utils-allow-clearing-discovery-auth.patch
Patch35:lio-utils-fix-systemd-service-start.patch
Patch36:lio-utils-update-HOWTO-for-systemd.patch
+Patch37:lio-utils-dont-use-U64-from-net-snmp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -192,6 +193,7 @@
%patch34 -p1
%patch35 -p1
%patch36 -p1
+%patch37 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
++ lio-utils-dont-use-U64-from-net-snmp.patch ++
diff -aurp lio-utils-4.1.orig/mib-modules/iscsiMib.h
lio-utils-4.1/mib-modules/iscsiMib.h
--- lio-utils-4.1.orig/mib-modules/iscsiMib.h 2011-05-06 14:16:58.0
-0700
+++ lio-utils-4.1/mib-modules/iscsiMib.h2016-06-01 10:49:33.721745152
-0700
@@ -442,8 +442,8 @@ struct iscsiSessionStats_entry {
u_long iscsiSsnIndex;
u_long iscsiSsnCmdPDUs;
u_long iscsiSsnRspPDUs;
-U64iscsiSsnTxDataOctets;
-U64iscsiSsnRxDataOctets;
+struct counter64 iscsiSsnTxDataOctets;
+struct counter64 iscsiSsnRxDataOctets;
u_long iscsiSsnLCTxDataOctets;
u_long iscsiSsnLCRxDataOctets;
struct iscsiSessionStats_entry *next;
diff -aurp lio-utils-4.1.orig/mib-modules/scsiMib.h
lio-utils-4.1/mib-modules/scsiMib.h
--- lio-utils-4.1.orig/mib-modules/scsiMib.h2011-05-06 14:16:58.0
-0700
+++ lio-utils-4.1/mib-modules/scsiMib.h 2016-06-01 10:49:09.965092277 -0700
@@ -216,7 +216,7 @@ struct scsiTgtPortTable_entry {
u_long scsiTgtPortInCommands;
u_long scsiTgtPortWrittenMegaBytes;
u_long scsiTgtPortReadMegaBytes;
-U64scsiTgtPortHSInCommands;
+struct counter64 scsiTgtPortHSInCommands;
struct scsiTgtPortTable_entry *next;
};
@@ -257,7 +257,7 @@ struct scsiAuthorizedIntrTable_entry {
u_long scsiAuthIntrOutCommands;
u_long scsiAuthIntrReadMegaBytes;
u_long scsiAuthIntrWrittenMegaBytes;
-U64scsiAuthIntrHSOutCommands;
+struct counter64 scsiAuthIntrHSOutCommands;
u_long scsiAuthIntrLastCreation;
long scsiAuthIntrRowStatus;
struct scsiAuthorizedIntrTable_entry *next;
@@ -337,7 +337,7 @@ struct scsiLuTable_entry {
u_long scsiLuWrittenMegaBytes;
u_long scsiLuInResets;
u_long scsiLuOutTaskSetFullStatus;
-U64scsiLuHSInCommands;
+struct counter64 scsiLuHSInCommands;
u_long scsiLuLastCreation;
struct scsiLuTable_entry *next;
};
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2016-05-19 12:15:14
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-12-08
16:56:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2016-05-19
12:15:17.0 +0200
@@ -1,0 +2,10 @@
+Mon May 16 22:15:12 UTC 2016 - ldun...@suse.com
+
+- Added in new source target_status, a helper script
+ to be installed in /usr/sbin (bsc#972717), adding:
+ * target_staus
+- Updated HOWTO to talk about systemd instead of init
+ (bsc#972720), adding:
+ * lio-utils-update-HOWTO-for-systemd.patch
+
+---
New:
lio-utils-update-HOWTO-for-systemd.patch
target_status
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.B3o5ja/_old 2016-05-19 12:15:18.0 +0200
+++ /var/tmp/diff_new_pack.B3o5ja/_new 2016-05-19 12:15:18.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lio-utils
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
Url:http://linux-iscsi.org/index.php/Lio-utils
Source: lio-utils-4.1.tar.bz2
Source1:target.service
+Source2:target_status
BuildRequires: net-snmp-devel
BuildRequires: python-devel
%{?systemd_requires}
@@ -85,6 +86,7 @@
Patch33:0033-lio-utils-dont-dump-RO-attributes.patch
Patch34:lio-utils-allow-clearing-discovery-auth.patch
Patch35:lio-utils-fix-systemd-service-start.patch
+Patch36:lio-utils-update-HOWTO-for-systemd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -189,6 +191,7 @@
%patch33 -p1
%patch34 -p1
%patch35 -p1
+%patch36 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
@@ -232,6 +235,7 @@
install -m 755 scripts/rc.target.suse $RPM_BUILD_ROOT/etc/init.d/target
ln -sf ../../etc/init.d/target $RPM_BUILD_ROOT/usr/sbin/rctarget
%endif
+install -D -m 0755 %{S:2} ${RPM_BUILD_ROOT}/usr/sbin/
%preun
%if %{?suse_version} > 1220
@@ -280,6 +284,7 @@
/usr/sbin/rctarget
%{python_sitelib}/*
%doc lio-utils.HOWTO
+/usr/sbin/target_status
%files -n lio-mibs
%defattr(-,root,root,-)
++ lio-utils-update-HOWTO-for-systemd.patch ++
diff -aurp lio-utils-4.1.orig/lio-utils.HOWTO lio-utils-4.1/lio-utils.HOWTO
--- lio-utils-4.1.orig/lio-utils.HOWTO 2016-05-16 14:32:59.826696797 -0700
+++ lio-utils-4.1/lio-utils.HOWTO 2016-05-16 15:11:04.361522496 -0700
@@ -35,28 +35,10 @@ lio-utils are deprecated and have been s
Starting the Target
-lio-utils will install an init.d script in /etc/init.d/target. Calling
-/etc/init.d/target start mounts Target/configFS and loads the
-target_core_mod. Upon successfully starting up the first time, you
-should see the following:
-
-target:~# /etc/init.d/target start
-Loading target_core_mod/ConfigFS core: [OK]
-
-And the following will appear in the kernel ring buffer (dmesg) and
-klogd output in /var/log:
-
-TARGET_CORE[0]: Loading Generic Kernel Storage Engine: v3.0.0 on Linux/i686 on
2.6.30
-TARGET_CORE[0]: Initialized ConfigFS Fabric Infrastructure: v1.0.0 on
Linux/i686 on 2.6.30
-SE_PC[0] - Registered Plugin Class: TRANSPORT
-PLUGIN_TRANSPORT[1] - pscsi registered
-PLUGIN_TRANSPORT[2] - stgt registered
-CORE_STGT[0]: Bus Initalization complete
-PLUGIN_TRANSPORT[4] - iblock registered
-PLUGIN_TRANSPORT[5] - rd_mcp registered
-PLUGIN_TRANSPORT[6] - fileio registered
-SE_PC[1] - Registered Plugin Class: OBJ
-PLUGIN_OBJ[1] - dev registered
+lio-utils uses systemd to manage it's the service it provides. Calling
+"systemctl start target" mounts target/configfs and loads the
+target_core_mod. Running "systemctl status target" should show you
+that the service has started correctly.
Configuring the Target
@@ -204,14 +186,14 @@ Successfully created TCM/ConfigFS storag
Displaying the Target status
-The status of the live Target can be displayed with /etc/init.d/target
-status, which calls tcm_node --listhbas to show the current
+The status of the live Target can be displayed with the target_status
+script, which calls tcm_node --listhbas to show the current
Target/configFS storage objects. Here is the target status after
successfully registering the Linux/BLOCK, Linux/pSCSI, Linux/VFS and
Target/RAMDISK objects with individual calls
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2014-12-08 16:56:36
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-09-06
12:18:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2014-12-08
16:56:14.0 +0100
@@ -1,0 +2,7 @@
+Wed Dec 3 15:11:27 PST 2014 - ldun...@suse.com
+
+- Update systemd service file to start after configfs (bnc#908270),
+ creating patch:
+ * lio-utils-fix-systemd-service-start.patch
+
+---
New:
lio-utils-fix-systemd-service-start.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.paq4aU/_old 2014-12-08 16:56:16.0 +0100
+++ /var/tmp/diff_new_pack.paq4aU/_new 2014-12-08 16:56:16.0 +0100
@@ -84,6 +84,7 @@
Patch32:0032-lio-utils-remove-systemd-default-dependies.patch
Patch33:0033-lio-utils-dont-dump-RO-attributes.patch
Patch34:lio-utils-allow-clearing-discovery-auth.patch
+Patch35:lio-utils-fix-systemd-service-start.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -187,6 +188,7 @@
%patch32 -p1
%patch33 -p1
%patch34 -p1
+%patch35 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
++ lio-utils-fix-systemd-service-start.patch ++
From: Lee Duncan
Date: Thu Dec 4 09:53:48 PST 2014
Subject: lio-utils: fix systemd service start
Fix systemd service so that it starts after
configfs is mounted.
---
scripts/target.service |2 ++
1 file changed, 2 insertions(+)
--- a/scripts/target.service
+++ b/scripts/target.service
@@ -1,6 +1,8 @@
[Unit]
Description="Generic Target Mode service"
DefaultDependencies=No
+Requires=sys-kernel-config.mount
+After=sys-kernel-config.mount
[Service]
Type=oneshot
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2014-09-06 12:18:18
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-06-16
21:27:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2014-09-06
12:18:25.0 +0200
@@ -1,0 +2,24 @@
+Wed Sep 3 01:48:48 CEST 2014 - r...@suse.de
+
+- sanitize release line in specfile
+
+---
+Wed Aug 27 01:34:05 UTC 2014 - ldun...@suse.com
+
+- allow resetting discovery_auth one- and two-way
+ authentication attributes to an empty string,
+ adding patch (bnc#893315):
+ * lio-utils-allow-clearing-discovery-auth.patch
+
+---
+Mon Jun 30 10:56:06 PDT 2014 - ldun...@suse.com
+
+- Stop dumping read-only attibutes (bnc#881553), adding:
+ 0033-lio-utils-dont-dump-RO-attributes.patch
+
+---
+Tue Jun 10 10:37:11 PDT 2014 - ldun...@suse.com
+
+- Added dirs fabric and policy in /var/target (bnc#880355)
+
+---
New:
0033-lio-utils-dont-dump-RO-attributes.patch
lio-utils-allow-clearing-discovery-auth.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.nyDTb3/_old 2014-09-06 12:18:26.0 +0200
+++ /var/tmp/diff_new_pack.nyDTb3/_new 2014-09-06 12:18:26.0 +0200
@@ -22,7 +22,7 @@
Name: lio-utils
Version:4.1
-Release:0.
+Release:0
Url:http://linux-iscsi.org/index.php/Lio-utils
Source: lio-utils-4.1.tar.bz2
Source1:target.service
@@ -82,6 +82,9 @@
Patch30:0030-target.service-Fixup-service-file.patch
Patch31:0031-lio_node-create-sys-kernel-config-target-iscsi-on-st.patch
Patch32:0032-lio-utils-remove-systemd-default-dependies.patch
+Patch33:0033-lio-utils-dont-dump-RO-attributes.patch
+Patch34:lio-utils-allow-clearing-discovery-auth.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -182,6 +185,8 @@
%patch30 -p1
%patch31 -p1
%patch32 -p1
+%patch33 -p1
+%patch34 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
@@ -193,12 +198,18 @@
mkdir -p $RPM_BUILD_ROOT%{_vardir}
mkdir $RPM_BUILD_ROOT%{_vardir}/pr
mkdir $RPM_BUILD_ROOT%{_vardir}/alua
+mkdir $RPM_BUILD_ROOT%{_vardir}/fabric
+mkdir $RPM_BUILD_ROOT%{_vardir}/policy
mkdir -p $RPM_BUILD_ROOT/etc/target
+echo "#!/bin/bash" > $RPM_BUILD_ROOT/etc/target/tcm_start.sh
for mod in target_core_mod target_core_file target_core_iblock
target_core_pscsi ; do
echo "modprobe $mod" >> $RPM_BUILD_ROOT/etc/target/tcm_start.sh
done
-echo "modprobe iscsi_target_mod" > $RPM_BUILD_ROOT/etc/target/lio_start.sh
+chmod 755 $RPM_BUILD_ROOT/etc/target/tcm_start.sh
+echo "#!/bin/bash" > $RPM_BUILD_ROOT/etc/target/lio_start.sh
+echo "modprobe iscsi_target_mod" >> $RPM_BUILD_ROOT/etc/target/lio_start.sh
+chmod 755 $RPM_BUILD_ROOT/etc/target/lio_start.sh
(cd tcm-py; python setup.py install --prefix=%{_prefix} --root=%{buildroot})
(cd lio-py; python setup.py install --prefix=%{_prefix} --root=%{buildroot})
mkdir $RPM_BUILD_ROOT/usr/sbin
@@ -258,6 +269,8 @@
%dir %{_vardir}
%dir %{_vardir}/pr
%dir %{_vardir}/alua
+%dir %{_vardir}/fabric
+%dir %{_vardir}/policy
/usr/sbin/iscsi-name
/usr/sbin/tcm_*
/usr/sbin/lio_node
++ 0033-lio-utils-dont-dump-RO-attributes.patch ++
diff -aurp lio-utils-4.1.orig/lio-py/lio_dump.py
lio-utils-4.1/lio-py/lio_dump.py
--- lio-utils-4.1.orig/lio-py/lio_dump.py 2014-06-30 10:51:24.475925688
-0700
+++ lio-utils-4.1/lio-py/lio_dump.py2014-06-30 10:53:18.195919922 -0700
@@ -136,12 +136,15 @@ def lio_target_configfs_dump(option, opt
print "echo " + value.rstrip() + " > " +
attrib_file
os.close(p)
- # Dump values of iscsi/iqn/tpgt/attrib/
+ # Dump values of iscsi/iqn/tpgt/auth/
print " authentication for iSCSI Target Portal
Group"
auth_dir = lio_root + "/" + iqn + "/tpgt_" + tpgt +
"/auth/"
if os.path.isdir(auth_dir):
auth_root = os.listdir(auth_dir)
for auth in auth_root:
+ # authenticate_target is RO
+ if auth == "authenticat
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2014-06-16 21:27:10
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-06-01
19:40:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2014-06-16
21:27:11.0 +0200
@@ -1,0 +2,17 @@
+Wed Jun 4 08:51:22 PDT 2014 - ldun...@suse.com
+
+- Updated to latest from SLE 12, adding patches:
+ * 0028-lio_dump-Implement-file-option.patch
+Implements a "--file" option for lio_dump (bnc#876881)
+ * 0029-tcm_dump-Implement-file-option.patch
+Implements a "--file" option for tcm_dump (bnc#876881)
+ * 0030-target.service-Fixup-service-file.patch
+Clean up systemd service file, using new "--file" options
+(bnc#876881)
+ * 0031-lio_node-create-sys-kernel-config-target-iscsi-on-st.patch
+create /sys/kernel/config/target/iscsi to trigger module
+load (bnc#877731)
+ * 0032-lio-utils-remove-systemd-default-dependies.patch
+adds DefaultDependencies=No to service file (bnc#878053)
+
+---
New:
0028-lio_dump-Implement-file-option.patch
0029-tcm_dump-Implement-file-option.patch
0030-target.service-Fixup-service-file.patch
0031-lio_node-create-sys-kernel-config-target-iscsi-on-st.patch
0032-lio-utils-remove-systemd-default-dependies.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.vgitwr/_old 2014-06-16 21:27:12.0 +0200
+++ /var/tmp/diff_new_pack.vgitwr/_new 2014-06-16 21:27:12.0 +0200
@@ -77,6 +77,11 @@
Patch25:0025-target.service-Add-systemd-service-file.patch
Patch26:0026-iscsiMib.c-fixes-for-strict-aliasing.patch
Patch27:0027-Compile-tools-with-OPTFLAGS.patch
+Patch28:0028-lio_dump-Implement-file-option.patch
+Patch29:0029-tcm_dump-Implement-file-option.patch
+Patch30:0030-target.service-Fixup-service-file.patch
+Patch31:0031-lio_node-create-sys-kernel-config-target-iscsi-on-st.patch
+Patch32:0032-lio-utils-remove-systemd-default-dependies.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -172,6 +177,11 @@
%patch25 -p1
%patch26 -p1
%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
++ 0028-lio_dump-Implement-file-option.patch ++
>From 47c3dbd3ba322d7d00881dada8282968a2f07349 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Thu, 15 May 2014 10:06:22 +0200
Subject: lio_dump: Implement '--file' option
Implement an optino '--file' to dump the script into a file.
This is required for systemd support as the system service
unit syntax doesn't support redirection.
References: bnc#876881
Signed-off-by: Hannes Reinecke
---
lio-py/lio_dump.py | 34 ++
1 file changed, 34 insertions(+)
diff --git a/lio-py/lio_dump.py b/lio-py/lio_dump.py
index c6a3600..13c5a31 100755
--- a/lio-py/lio_dump.py
+++ b/lio-py/lio_dump.py
@@ -279,6 +279,38 @@ def lio_backup_to_file(option, opt_str, value, parser):
back.close()
return backup_file
+def lio_dump_to_file(option, opt_str, value, parser):
+ dump_file = str(value)
+
+ op = "lio_dump --stdout"
+ p = sub.Popen(op, shell=True, stdout=sub.PIPE).stdout
+ if not p:
+ print "Unable to dump LIO-Target/ConfigFS running state"
+ sys.exit(1)
+
+ try:
+ back = open(dump_file, 'w+')
+ except IOError:
+ print "cannot open " + dump_file
+ p.close()
+ sys.exit(1)
+ else:
+ line = p.readline()
+ while line:
+ print >>back, line.rstrip()
+ line = p.readline()
+
+ back.close()
+
+ p.close()
+
+ op = "chmod 755 " + dump_file
+ ret = os.system(op)
+ if ret:
+ print "Unable to mark " + dump_file + " as executable"
+
+ return dump_file
+
def main():
parser = OptionParser()
@@ -286,6 +318,8 @@ def main():
help="Dump running LIO-Target/ConfigFS syntax to STDOUT")
parser.add_option("--t", "--tofile", action="callback",
callback=lio_backup_to_file, nargs=1,
type="string", dest="DATE_TIME", help="Backup running
LIO-Target/ConfigFS syntax to /etc/target/backup/lio_backup-.sh")
+parser.add_option("--f", "--file", action="callback",
callback=lio_dump_to_file, nar
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2014-06-01 19:40:24
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-05-02
13:59:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2014-06-01
19:40:29.0 +0200
@@ -1,0 +2,5 @@
+Wed May 21 12:11:25 UTC 2014 - jseg...@novell.com
+
+- added necessary macros for systemd files
+
+---
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.dmxhQX/_old 2014-06-01 19:40:32.0 +0200
+++ /var/tmp/diff_new_pack.dmxhQX/_new 2014-06-01 19:40:32.0 +0200
@@ -224,6 +224,16 @@
%insserv_cleanup target
%endif
+%pre
+%if 0%{?suse_version} > 1220
+ %service_add_pre target.service
+%endif
+
+%post
+%if 0%{?suse_version} > 1220
+ %service_add_post target.service
+%endif
+
%files
%defattr(-,root,root,-)
%if %{?suse_version} > 1220
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit lio-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package lio-utils for openSUSE:Factory
checked in at 2014-04-02 17:24:44
Comparing /work/SRC/openSUSE:Factory/lio-utils (Old)
and /work/SRC/openSUSE:Factory/.lio-utils.new (New)
Package is "lio-utils"
Changes:
--- /work/SRC/openSUSE:Factory/lio-utils/lio-utils.changes 2014-01-02
11:15:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.lio-utils.new/lio-utils.changes 2014-04-02
17:24:46.0 +0200
@@ -1,0 +2,8 @@
+Mon Mar 31 16:40:41 CEST 2014 - h...@suse.de
+
+- Add patch:
+ * 0024-lio_node-do-not-fail-if-target-port-is-already-disab.patch:
+lio_node should not fail if target port is already disabled
+(bnc#863284)
+
+---
New:
0024-lio_node-do-not-fail-if-target-port-is-already-disab.patch
Other differences:
--
++ lio-utils.spec ++
--- /var/tmp/diff_new_pack.tGC1vT/_old 2014-04-02 17:24:46.0 +0200
+++ /var/tmp/diff_new_pack.tGC1vT/_new 2014-04-02 17:24:46.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lio-utils
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,20 @@
Summary:Linux-iSCSI.org Target Userspace utils
+License:GPL-2.0+
+Group: System/Kernel
Name: lio-utils
Version:4.0
Release:0.
-Group: System/Kernel
Url:http://linux-iscsi.org/index.php/Lio-utils
Source: lio-utils-4.0.tar.bz2
Source1:target.service
-License:GPL-2.0+
-BuildRequires: net-snmp-devel python-devel
+BuildRequires: net-snmp-devel
+BuildRequires: python-devel
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
-AutoReqProv:on
Patch1: 0001-Remove-tcm_snap-reference.patch
Patch2: 0002-Fixup-paths-for-SLES-11-SP2.patch
Patch3: 0003-Add-init-script-for-SUSE.patch
@@ -54,6 +54,7 @@
Patch21:0021-lio_dump-Error-checking-in-startup-script.patch
Patch22:0022-rc.target.suse-Save-configuration-during-shutdown.patch
Patch23:0023-Use-OPTFLAGS-when-compiling.patch
+Patch24:0024-lio_node-do-not-fail-if-target-port-is-already-disab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,10 +79,10 @@
Nicholas Bellinger
%package -n lio-mibs
-License:GPL-2.0+
Summary:Linux-iSCSI.org Target Userspace utils
Group: System/Kernel
-Requires: %{name} = %{version} net-snmp
+Requires: %{name} = %{version}
+Requires: net-snmp
%description -n lio-mibs
lio-utils provide a simple low-level configuration tool
@@ -130,6 +131,7 @@
%patch21 -p1
%patch22 -p1
%patch23 -p1
+%patch24 -p1
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
++ 0024-lio_node-do-not-fail-if-target-port-is-already-disab.patch ++
>From 14722ab97272df00c30d7619a74b420659e6ad98 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Mon, 31 Mar 2014 14:36:02 +0200
Subject: [PATCH] lio_node: do not fail if target port is already disabled
When calling 'lio_node --unload' the command should not fail
if the target port is already disabled.
References: bnc#863284
Signed-off-by: Hannes Reinecke
---
lio-py/lio_node.py | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/lio-py/lio_node.py b/lio-py/lio_node.py
index db6b94f..725ee94 100755
--- a/lio-py/lio_node.py
+++ b/lio-py/lio_node.py
@@ -97,7 +97,6 @@ def lio_alua_process_secondary_md(option, opt_str, value,
parser):
# LIO-Target endpoint (iqn+tpgt) exists..
lio_alua_check_secondary_md(iqn, tpgt)
lio_alua_set_secondary_write_md(iqn, tpgt, lun)
- lio_err("Unable to locate ALUA secondary metadata file: " +
alua_sec_md_file)
return
# print "Using alua_sec_md_file: " + alua_sec_md_file
@@ -202,10 +201,15 @@ def __lio_target_del_tpg(option, opt_str, value, parser,
delete_tpg_md):
# This will set TPG Status to INACTIVE force all of the iSCSI sessions
for this
# tiqn+tpgt tuple to be released.
- disable_op = "echo 0 > " + lio_root + "/" + iqn + "/tpgt_" + tpgt +
"/enable"
- ret = os.system(disable_op)
- if ret:
- lio_err("Unable to disable TPG: " + iqn + " TPGT: " + tpgt)
+ enable_path = l
