Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2014-03-21 12:13:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2014-01-29 13:08:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2014-03-21 12:13:50.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 10 10:45:43 PDT 2014 - [email protected] + +- Cleaned up systemd unit files and spec entries (bnc#847953) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.EOlxp8/_old 2014-03-21 12:13:50.000000000 +0100 +++ /var/tmp/diff_new_pack.EOlxp8/_new 2014-03-21 12:13:50.000000000 +0100 @@ -134,9 +134,9 @@ %config /etc/iscsi/ifaces/iface.example /etc/iscsid.conf %if 0%{?suse_version} >= 1230 -%config %{_unitdir}/iscsid.service +%{_unitdir}/iscsid.service %{_unitdir}/iscsid.socket -%config %{_unitdir}/iscsi.service +%{_unitdir}/iscsi.service %else %config /etc/init.d/iscsid %config /etc/init.d/boot.iscsid-early ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.EOlxp8/_old 2014-03-21 12:13:50.000000000 +0100 +++ /var/tmp/diff_new_pack.EOlxp8/_new 2014-03-21 12:13:51.000000000 +0100 @@ -708,20 +708,19 @@ [ "$iscsiuio_pid" ] && kill -TERM $iscsiuio_pid diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service new file mode 100644 -index 000000000000..664d3aa6100f +index 000000000000..54fd8159ad56 --- /dev/null +++ b/etc/systemd/iscsi.service -@@ -0,0 +1,16 @@ +@@ -0,0 +1,15 @@ +[Unit] +Description=Login and scanning of iSCSI devices +Documentation=man:iscsiadm(8) man:iscsid(8) -+After=network.target NetworkManager-wait-online.service iscsid.service ++After=network.target network-online.target iscsid.service +ConditionPathExists=/etc/iscsi/initiatorname.iscsi + +[Service] +Type=oneshot +ExecStart=/sbin/iscsiadm -m node --loginall=automatic -+ExecStop=/bin/sync +ExecStop=/sbin/iscsiadm -m session --logout +SuccessExitStatus=21 +RemainAfterExit=true @@ -730,14 +729,14 @@ +WantedBy=remote-fs.target diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service new file mode 100644 -index 000000000000..127e56a70572 +index 000000000000..24ecd5e51a16 --- /dev/null +++ b/etc/systemd/iscsid.service -@@ -0,0 +1,12 @@ +@@ -0,0 +1,13 @@ +[Unit] +Description=Open-iSCSI +Documentation=man:iscsid(8) man:iscsiadm(8) -+After=network.target NetworkManager-wait-online.service tgtd.service targetcli.service ++After=network.target network-online.target tgtd.service targetcli.service + +[Service] +Type=forking @@ -746,6 +745,7 @@ + +[Install] +WantedBy=multi-user.target ++Also=iscsid.socket diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket new file mode 100644 index 000000000000..58a8d1239996 @@ -15255,10 +15255,6 @@ */ /** -diff --git a/rpm/.build_rpm.swp b/rpm/.build_rpm.swp -new file mode 100644 -index 000000000000..cfc43160085f -Binary files /dev/null and b/rpm/.build_rpm.swp differ diff --git a/rpm/build_rpm b/rpm/build_rpm index cbfd1003897a..effb5494b649 100755 --- a/rpm/build_rpm @@ -15436,11 +15432,16 @@ echo "$RPM src rpm copied to $DESTDIR" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 2e21afc6bc7b..8072355bb50b 100644 +index 2e21afc6bc7b..ed7944b1b218 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,219 @@ +@@ -1,4 +1,224 @@ ------------------------------------------------------------------- ++Mon Mar 10 10:45:43 PDT 2014 - [email protected] ++ ++- Cleaned up systemd unit files and spec entries (bnc#847953) ++ ++------------------------------------------------------------------- +Tue Jan 28 11:40:16 PST 2014 - [email protected] + +- Replaced 8 patches with one, to clean up. Added patch: @@ -15659,7 +15660,7 @@ Fri Dec 9 15:09:01 CET 2011 - [email protected] - iscsiadm: Return correct error when login fails (bnc#715071) -@@ -40,6 +255,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] +@@ -40,6 +260,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -15671,7 +15672,7 @@ Mon Oct 24 09:13:19 CEST 2011 - [email protected] - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -101,6 +321,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] +@@ -101,6 +326,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] - Include scripts for automated build ------------------------------------------------------------------- @@ -15683,7 +15684,7 @@ Wed Feb 2 11:32:12 CET 2011 - [email protected] - Fix the following issues: -@@ -224,6 +449,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] +@@ -224,6 +454,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -15695,7 +15696,7 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Synchronize startup settings (bnc#514273) -@@ -231,11 +461,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] +@@ -231,11 +466,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- @@ -15721,7 +15722,7 @@ - Fix relogin retry handling (bnc#466846) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 27ab050554f1..b161fff22eaf 100644 +index 27ab050554f1..bb5a269abff2 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -1,7 +1,7 @@ @@ -15862,9 +15863,9 @@ -%config /etc/init.d/open-iscsi -%config /etc/init.d/boot.open-iscsi +%if 0%{?suse_version} >= 1230 -+%config %{_unitdir}/iscsid.service ++%{_unitdir}/iscsid.service +%{_unitdir}/iscsid.socket -+%config %{_unitdir}/iscsi.service ++%{_unitdir}/iscsi.service +%else +%config /etc/init.d/iscsid +%config /etc/init.d/boot.iscsid-early -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
