open-iscsi-systemd.patch

   1 --- open-iscsi-2.1.4/etc/systemd/iscsi.service.template.orig    2022-05-15 21:39:53.531578661 +0200
   2 +++ open-iscsi-2.1.4/etc/systemd/iscsi.service.template 2022-05-15 21:43:54.510273168 +0200
   3 @@ -5,7 +5,7 @@ DefaultDependencies=no
   4  Before=remote-fs-pre.target
   5  After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
   6  Wants=remote-fs-pre.target
   7 -ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
   8 +ConditionDirectoryNotEmpty=/etc/iscsi/nodes
   9
  10  [Service]
  11  Type=oneshot
  12 --- open-iscsi-2.1.7/etc/systemd/iscsid.service.template.orig   2022-05-16 22:04:51.668726910 +0200
  13 +++ open-iscsi-2.1.7/etc/systemd/iscsid.service.template        2022-05-16 22:12:39.789524215 +0200
  14 @@ -9,7 +9,7 @@ Requires=iscsi-init.service iscsi-shutdo
  15  [Service]
  16  Type=notify
  17  NotifyAccess=main
  18 -ExecStart=@SBINDIR@/iscsid -f
  19 +ExecStart=@SBINDIR@/iscsid -f -u iscsi -g iscsi
  20  KillMode=mixed
  21  Restart=on-failure
  22
  23 --- open-iscsi-2.1.7/Makefile.orig      2022-05-16 22:24:15.152423778 +0200
  24 +++ open-iscsi-2.1.7/Makefile   2022-05-16 22:38:37.014421337 +0200
  25 @@ -7,7 +7,7 @@
  26  DESTDIR ?=
  27
  28  prefix = /usr
  29 -exec_prefix = /usr
  30 +exec_prefix =
  31  mandir = $(prefix)/share/man
  32  etcdir = /etc
  33
  34 --- open-iscsi-2.1.7/etc/systemd/iscsi-init.service.template.orig       2022-05-16 22:24:15.152423778 +0200
  35 +++ open-iscsi-2.1.7/etc/systemd/iscsi-init.service.template    2022-05-16 22:39:01.854286768 +0200
  36 @@ -17,4 +17,4 @@ WantedBy=systemd-remount-fs.service
  37  [Service]
  38  Type=oneshot
  39  RemainAfterExit=no
  40 -ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
  41 +ExecStart=/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
  42 --- open-iscsi-2.1.4/etc/systemd/iscsi-onboot.service.orig      2022-05-15 22:26:25.683118945 +0200
  43 +++ open-iscsi-2.1.4/etc/systemd/iscsi-onboot.service   2022-05-16 20:50:19.019623997 +0200
  44 @@ -9,7 +9,7 @@ ConditionDirectoryNotEmpty=/sys/class/is
  45
  46  [Service]
  47  Type=oneshot
  48 -ExecStart=-/usr/libexec/iscsi-mark-root-nodes
  49 +ExecStart=-/lib/systemd/pld-helpers.d/iscsi-mark-root-nodes
  50
  51  [Install]
  52  WantedBy=sysinit.target
  53 --- open-iscsi-2.1.4/etc/systemd/iscsi-shutdown.service.orig    2022-05-15 22:26:25.683118945 +0200
  54 +++ open-iscsi-2.1.4/etc/systemd/iscsi-shutdown.service 2022-05-16 20:50:36.799527675 +0200
  55 @@ -11,5 +11,5 @@ RefuseManualStop=yes
  56  [Service]
  57  Type=oneshot
  58  RemainAfterExit=true
  59 -ExecStart=-/usr/bin/true
  60 -ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
  61 +ExecStart=-/bin/true
  62 +ExecStop=-/sbin/iscsiadm -m node --logoutall=all