diff --git a/6024-Added-service-file-for-iscsi-logins.patch b/6024-Added-service-file-for-iscsi-logins.patch new file mode 100644 index 0000000..4406891 --- /dev/null +++ b/6024-Added-service-file-for-iscsi-logins.patch @@ -0,0 +1,38 @@ +From 666694ed3654e333751af0897c8b71f8cc1829f8 Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Tue, 16 Oct 2018 13:53:09 -0700 +Subject: [PATCH] Added service file for iscsi logins + +This service file layers on top of iscsid.serivce +to manage logging into and out of known targets. +--- + etc/systemd/iscsi.service | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + create mode 100644 etc/systemd/iscsi.service + +diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service +new file mode 100644 +index 0000000..0edcf51 +--- /dev/null ++++ b/etc/systemd/iscsi.service +@@ -0,0 +1,17 @@ ++[Unit] ++Description=Login and scanning of iSCSI devices ++Documentation=man:iscsiadm(8) man:iscsid(8) ++Before=remote-fs.target ++After=network.target network-online.target iscsid.service ++ConditionPathExists=/etc/iscsi/initiatorname.iscsi ++ ++[Service] ++Type=oneshot ++ExecStart=-/sbin/iscsiadm -m node --loginall=automatic ++ExecStop=/sbin/iscsiadm -m node --logoutall=automatic ++ExecStop=/sbin/iscsiadm -m node --logoutall=manual ++SuccessExitStatus=21 ++RemainAfterExit=true ++ ++[Install] ++WantedBy=remote-fs.target +-- +1.8.3.1 + diff --git a/6024-update-service-files.patch b/6024-update-service-files.patch deleted file mode 100644 index 5fc2fc5..0000000 --- a/6024-update-service-files.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 74df2457ac1f91fa752d3143e2e6b6f99b67a0a8 Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam -Date: Wed, 8 Jan 2020 03:26:02 -0500 -Subject: [PATCH] update service files - ---- - etc/systemd/iscsi.service | 18 ++++++++++++++++++ - etc/systemd/iscsid.service | 14 +++++++++----- - etc/systemd/iscsid.socket | 2 +- - etc/systemd/iscsiuio.service | 19 +++++++++++++++++++ - etc/systemd/iscsiuio.socket | 9 +++++++++ - 5 files changed, 56 insertions(+), 6 deletions(-) - create mode 100644 etc/systemd/iscsi.service - create mode 100644 etc/systemd/iscsiuio.service - create mode 100644 etc/systemd/iscsiuio.socket - -diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service -new file mode 100644 -index 0000000..e475888 ---- /dev/null -+++ b/etc/systemd/iscsi.service -@@ -0,0 +1,18 @@ -+[Unit] -+Description=Login and scanning of iSCSI devices -+Documentation=man:iscsiadm(8) man:iscsid(8) -+Before=remote-fs.target -+After=network.target network-online.target iscsid.service -+Requires=iscsid.service -+ConditionPathExists=/etc/iscsi/initiatorname.iscsi -+ -+[Service] -+Type=oneshot -+ExecStart=/sbin/iscsiadm -m node --loginall=automatic -+ExecStop=/sbin/iscsiadm -m node --logoutall=automatic -+ExecStop=/sbin/iscsiadm -m node --logoutall=manual -+SuccessExitStatus=21 -+RemainAfterExit=true -+ -+[Install] -+WantedBy=remote-fs.target -diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service -index 028e0b3..4fef168 100644 ---- a/etc/systemd/iscsid.service -+++ b/etc/systemd/iscsid.service -@@ -1,13 +1,17 @@ - [Unit] - Description=Open-iSCSI - Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) --After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service -+DefaultDependencies=no -+DefaultDependencies=no -+After=network.target iscsiuio.service -+Before=remote-fs-pre.target - - [Service] --Type=forking --PIDFile=/var/run/iscsid.pid --ExecStart=/usr/sbin/iscsid --ExecStop=/sbin/iscsiadm -k 0 2 -+Type=notify -+NotifyAccess=main -+ExecStart=/sbin/iscsid -f -+KillMode=mixed -+Restart=on-failure - - [Install] - WantedBy=multi-user.target -+Also=iscsid.socket -diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket -index 832451d..58a8d12 100644 ---- a/etc/systemd/iscsid.socket -+++ b/etc/systemd/iscsid.socket -@@ -1,6 +1,6 @@ - [Unit] - Description=Open-iSCSI iscsid Socket --Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) -+Documentation=man:iscsid(8) man:iscsiadm(8) - - [Socket] - ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE -diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service -new file mode 100644 -index 0000000..e4d9fd0 ---- /dev/null -+++ b/etc/systemd/iscsiuio.service -@@ -0,0 +1,19 @@ -+[Unit] -+Description=iSCSI UserSpace I/O driver -+Documentation=man:iscsiuio(8) -+DefaultDependencies=no -+Conflicts=shutdown.target -+Requires=iscsid.service -+BindTo=iscsid.service -+After=network.target -+Before=remote-fs-pre.target iscsid.service -+ -+[Service] -+Type=notify -+NotifyAccess=main -+ExecStart=/sbin/iscsiuio -f -+KillMode=mixed -+Restart=on-failure -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/etc/systemd/iscsiuio.socket b/etc/systemd/iscsiuio.socket -new file mode 100644 -index 0000000..d42cedc ---- /dev/null -+++ b/etc/systemd/iscsiuio.socket -@@ -0,0 +1,9 @@ -+[Unit] -+Description=Open-iSCSI iscsiuio Socket -+Documentation=man:iscsiuio(8) -+ -+[Socket] -+ListenStream=@ISCSID_UIP_ABSTRACT_NAMESPACE -+ -+[Install] -+WantedBy=sockets.target --- -1.8.3.1 - diff --git a/6025-Fixed-iscsi.service-considering-every-signal-and-exi.patch b/6025-Fixed-iscsi.service-considering-every-signal-and-exi.patch new file mode 100644 index 0000000..31b21e2 --- /dev/null +++ b/6025-Fixed-iscsi.service-considering-every-signal-and-exi.patch @@ -0,0 +1,27 @@ +From bbe55896a92a20db2ce79d100e3027cd4940ddce Mon Sep 17 00:00:00 2001 +From: igo95862 +Date: Mon, 11 Feb 2019 14:53:23 -0800 +Subject: [PATCH] Fixed iscsi.service considering every signal and exit code as + successful. Now only code 21 (no objects found to execute on) and normal exit + conditions are valid. + +--- + etc/systemd/iscsi.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service +index 03876c5..e475888 100644 +--- a/etc/systemd/iscsi.service ++++ b/etc/systemd/iscsi.service +@@ -8,7 +8,7 @@ ConditionPathExists=/etc/iscsi/initiatorname.iscsi + + [Service] + Type=oneshot +-ExecStart=-/sbin/iscsiadm -m node --loginall=automatic ++ExecStart=/sbin/iscsiadm -m node --loginall=automatic + ExecStop=/sbin/iscsiadm -m node --logoutall=automatic + ExecStop=/sbin/iscsiadm -m node --logoutall=manual + SuccessExitStatus=21 +-- +1.8.3.1 + diff --git a/9002-add-sleep-for-service.patch b/9002-add-sleep-for-service.patch index 3acd92f..0c4dc5e 100644 --- a/9002-add-sleep-for-service.patch +++ b/9002-add-sleep-for-service.patch @@ -1,23 +1,27 @@ -From 8badb69eb47e3c93619fccf5667a0d681b5a34a6 Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam -Date: Wed, 8 Jan 2020 03:33:14 -0500 +From 42c30d191e3da86f543f665d49bc84a68ca25bf7 Mon Sep 17 00:00:00 2001 +From: pengyeqing +Date: Sat, 26 Jan 2019 22:44:59 +0800 Subject: [PATCH] iscsi-initiator-utils: add sleep for service +add sleep for service + +Signed-off-by: pengyeqing --- etc/systemd/iscsid.service | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service -index 4fef168..8df224e 100644 +index 653dd08..ecc5f65 100644 --- a/etc/systemd/iscsid.service +++ b/etc/systemd/iscsid.service -@@ -9,6 +9,7 @@ Before=remote-fs-pre.target - Type=notify - NotifyAccess=main - ExecStart=/sbin/iscsid -f +@@ -10,6 +10,7 @@ Before=remote-fs-pre.target + Type=forking + PIDFile=/var/run/iscsid.pid + ExecStart=/usr/sbin/iscsid +ExecStartPost=/usr/bin/sleep 1 - KillMode=mixed - Restart=on-failure - + ExecStop=/sbin/iscsiadm -k 0 2 + + [Install] -- 1.8.3.1 + diff --git a/9003-not-send-stop-message-if-iscsid-absent.patch b/9003-not-send-stop-message-if-iscsid-absent.patch index fdc2f15..9c4663e 100644 --- a/9003-not-send-stop-message-if-iscsid-absent.patch +++ b/9003-not-send-stop-message-if-iscsid-absent.patch @@ -1,45 +1,25 @@ -From 17764fc96f0ece0dca472d7f9b6105c62b4d7701 Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam -Date: Wed, 8 Jan 2020 03:43:16 -0500 +From 1412b27dc88f5f2cdda5cb1cf0d2a9313313a390 Mon Sep 17 00:00:00 2001 +From: pengyeqing +Date: Mon, 20 Jan 2020 19:43:52 +0800 Subject: [PATCH] iscsi-initiator-utils: not send stop message if iscsid absent +Signed-off-by: pengyeqing --- - etc/systemd/iscsid.service | 1 + - etc/systemd/iscsiuio.service | 3 +- - usr/iscsiadm.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 74 insertions(+), 1 deletion(-) + etc/systemd/iscsid.service | 2 ++ + usr/iscsiadm.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 73 insertions(+) diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service -index 8df224e..fd85d52 100644 +index 2566b49..44a0363 100644 --- a/etc/systemd/iscsid.service +++ b/etc/systemd/iscsid.service -@@ -12,6 +12,7 @@ ExecStart=/sbin/iscsid -f +@@ -9,6 +9,8 @@ PIDFile=/var/run/iscsid.pid + ExecStart=/usr/sbin/iscsid ExecStartPost=/usr/bin/sleep 1 - KillMode=mixed - Restart=on-failure + ExecStop=/sbin/iscsiadm -k 0 2 ++Restart=always +RestartSec=2s - [Install] - WantedBy=multi-user.target -diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service -index e4d9fd0..6bae65b 100644 ---- a/etc/systemd/iscsiuio.service -+++ b/etc/systemd/iscsiuio.service -@@ -4,7 +4,7 @@ Documentation=man:iscsiuio(8) - DefaultDependencies=no - Conflicts=shutdown.target - Requires=iscsid.service --BindTo=iscsid.service -+BindsTo=iscsid.service - After=network.target - Before=remote-fs-pre.target iscsid.service - -@@ -14,6 +14,7 @@ NotifyAccess=main - ExecStart=/sbin/iscsiuio -f - KillMode=mixed - Restart=on-failure -+TimeoutStopSec=1 - [Install] WantedBy=multi-user.target diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c diff --git a/open-iscsi.spec b/open-iscsi.spec index 576abc1..b4c2986 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.0.876 -Release: 15 +Release: 16 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org @@ -34,7 +34,8 @@ Patch6020: 6020-Resource-leak-Variable-raw.patch Patch6021: 6021-Allow-reading-sysfs-port-to-fail-gracefully.patch Patch6022: 6022-Fix-incorrect-sysfs-logic-for-port-and-ip-address.patch Patch6023: 6023-Handle-ENOTCONN-error-separately-when-reading-sysfs.patch -Patch6024: 6024-update-service-files.patch +Patch6024: 6024-Added-service-file-for-iscsi-logins.patch +Patch6025: 6025-Fixed-iscsi.service-considering-every-signal-and-exi.patch Patch9000: 9000-change-iscsi-iqn-default-value.patch Patch9001: 9001-iscsid-Check-nr_sessions-when-creating-a-copy-of-exi.patch @@ -184,6 +185,12 @@ fi %{_mandir}/man8/* %changelog +* Mon Jan 20 2020 geruijun - 2.0.876-16 +- Type:bugfix +- ID:NA +- SUG:restart +- DESC:fix service error + * Fri Jan 17 2020 openEuler Buildteam - 2.0.876-15 - Type:bugfix - ID:NA @@ -196,7 +203,7 @@ fi - SUG:restart - DESC:provide iscsi-initiator-utils-devel -* Wed Jan 9 2020 openEuler Buildteam - 2.0.876-13 +* Thu Jan 9 2020 openEuler Buildteam - 2.0.876-13 - Type:enhancement - ID:NA - SUG:restart