Hello community,
here is the log from the commit of package tgt for openSUSE:Factory checked in
at 2015-09-11 09:04:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tgt (Old)
and /work/SRC/openSUSE:Factory/.tgt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tgt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tgt/tgt.changes 2015-06-30 10:16:48.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.tgt.new/tgt.changes 2015-09-11
09:04:50.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 10 07:03:47 UTC 2015 - bwiedem...@suse.com
+
+- Allow to add options via sysconfig (bnc#828214)
+- Drop invalid ExecStopPre entry
+
+-------------------------------------------------------------------
New:
----
sysconfig.tgt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tgt.spec ++++++
--- /var/tmp/diff_new_pack.5mF1Wr/_old 2015-09-11 09:04:51.000000000 +0200
+++ /var/tmp/diff_new_pack.5mF1Wr/_new 2015-09-11 09:04:51.000000000 +0200
@@ -35,6 +35,7 @@
Source: %{name}-%{version}.tar.bz2
Source1: %{name}d.service
Source3: %{name}.services
+Source4: sysconfig.%{name}
Patch1: %{name}-git-update
Patch2: %{name}-fix-build
Patch3: setup-tgt-conf-d.patch
@@ -72,6 +73,7 @@
%{__make} DESTDIR=%{buildroot} docdir=%_docdir/%{name} install
install -vD -m 644 %{S:1} %{buildroot}/%{_unitdir}/%{name}d.service
install -vD %{S:3} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/tgt
+install -vD %{S:4} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.%{name}
ln -sf service %{buildroot}/usr/sbin/rc%{name}
%pre
@@ -94,6 +96,7 @@
%dir /etc/tgt/conf.d
%config %attr(0644,root,root) /etc/tgt/targets.conf
%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/tgt
+/var/adm/fillup-templates/sysconfig.tgt
%{_unitdir}/%{name}d.service
%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration
%doc doc/README.mmc doc/README.passthrough doc/README.sbcjukebox doc/README.ssc
++++++ sysconfig.tgt ++++++
## Path: Network/File systems/iSCSI
## Description: tgt iSCSI server options
## Type: string
## Default: ""
## ServiceRestart: tgtd
#
# Options for tgtd
# set listen addr with --iscsi portal=192.0.2.1:3260
#
TGTD_OPTS=""
++++++ tgtd.service ++++++
--- /var/tmp/diff_new_pack.5mF1Wr/_old 2015-09-11 09:04:51.000000000 +0200
+++ /var/tmp/diff_new_pack.5mF1Wr/_new 2015-09-11 09:04:51.000000000 +0200
@@ -3,11 +3,12 @@
After=network.target
[Service]
+EnvironmentFile=-/etc/sysconfig/tgt
Type=forking
User=root
-ExecStart=/usr/sbin/tgtd
+ExecStart=/usr/sbin/tgtd $TGTD_OPTS
ExecStartPost=/bin/bash -c "sleep 0.5 ; /usr/sbin/tgtadm --op update --mode
sys --name State -v offline ; /usr/sbin/tgt-admin -e -c /etc/tgt/targets.conf ;
/usr/sbin/tgtadm --op update --mode sys --name State -v ready"
-ExecStopPre=/usr/sbin/tgt-admin --update ALL -c /dev/null
+# only valid in .socket: ExecStopPre=/usr/sbin/tgt-admin --update ALL -c
/dev/null
ExecStop=-/usr/sbin/tgtadm --op delete --mode system
