[PR PATCH] open-iscsi: add runit service [ci skip]

[PR PATCH] open-iscsi: add runit service [ci skip]

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

There is a new pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service [ci skip]
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2585 bytes --]

From bc78d00672db1d6c74e23d1f3bcd2591cf72c926 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH 1/2] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 4 ++++
 srcpkgs/open-iscsi/template         | 1 +
 2 files changed, 5 insertions(+)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..d78c31b747dd
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..f152ef2a693b 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -32,6 +32,7 @@ do_build() {
 }
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

From f740b0149703bedaefe79913cdc146cfd0b20720 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:27 +0100
Subject: [PATCH 2/2] open-iscsi: Improve template readability

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index f152ef2a693b..159f9e80861b 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -16,20 +16,24 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
 	vsv iscsid

Re: open-iscsi: add runit service [ci skip]

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475340060

Comment:
It's probably better to bump the revision and to remove the ci skip tag (there's no reason to avoid running CI here I believe).

Re: open-iscsi: add runit service [ci skip]

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475340060

Comment:
It's probably better to bump the revision and to remove the ci skip tag (there's no reason to avoid running CI here I believe).

Also, squash the second commit into the first.

Re: open-iscsi: add runit service [ci skip]

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475355380

Comment:
yes, revbump, and don't skip ci

Re: [PR REVIEW] open-iscsi: add runit service [ci skip]

[paper42]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#discussion_r1141464723

Comment:
what's the point of this source when we are not using any variables from it?

Re: [PR REVIEW] open-iscsi: add runit service [ci skip]

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#discussion_r1141477284

Comment:
Good point, I'll remove it.

Re: open-iscsi: add runit service [ci skip]

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475409088

Comment:
@mhmdanas @classabbyamp I'll remove the skip CI tag. But I don't know what you mean by revbump. Could you please explain?

Re: open-iscsi: add runit service [ci skip]

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475409088

Comment:
@mhmdanas @classabbyamp I'll remove the skip CI tag. But I don't know what you mean by revbump. Could you please explain?

Edit: Ah, I guess you mean `revision: 2` in `template`. Will do.

Re: open-iscsi: add runit service [ci skip]

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475409873

Comment:
increment the value of `revision` so the package gets rebuilt and people get the updated version 

Re: [PR PATCH] [Updated] open-iscsi: add runit service [ci skip]

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

There is an updated pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service [ci skip]
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2175 bytes --]

From 6d8fe18be333065488a7a165144828ed6980cc05 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 4 ++++
 srcpkgs/open-iscsi/template         | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..d78c31b747dd
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r conf ] && . ./conf
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..5044dd5db96c 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.8
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -16,22 +16,27 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

Re: open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475410023

Comment:
Should be OK now.

Re: [PR REVIEW] open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#discussion_r1141478036

Comment:
done.

Re: [PR REVIEW] open-iscsi: add runit service

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#discussion_r1141478634

Comment:
Did you forget to commit or push your removal of this line? It's still there.

Re: [PR PATCH] [Updated] open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

There is an updated pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2148 bytes --]

From bb76f84d1ae8600d666ae27b0dff27c59e169a86 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 3 +++
 srcpkgs/open-iscsi/template         | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..6fc13d24a8a5
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..5044dd5db96c 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.8
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -16,22 +16,27 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

Re: [PR REVIEW] open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New review comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#discussion_r1141478817

Comment:
oops, forgot to add, re-check now please.

Re: open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475412664

Comment:
I think the commit message and PR title should be changed to **open-iscsi: Add iscsid runit service**, because I'm not sure if we need the `iscsiuio` service later (as discussed in the issue linked in the PR description). What do you think?

Re: open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1475412664

Comment:
I think the commit message and PR title should be changed to **open-iscsi: add iscsid runit service**, because I'm not sure if we need the `iscsiuio` service later (as discussed in the issue linked in the PR description). What do you think?

Re: open-iscsi: add runit service

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1476473120

Comment:
I think it's fine personally.

Re: open-iscsi: add runit service

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1542722862

Comment:
rebase on master please

Re: [PR PATCH] [Updated] open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

There is an updated pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2148 bytes --]

From 809a91b658533425f28fa75f806c3b68d508c467 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 3 +++
 srcpkgs/open-iscsi/template         | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..6fc13d24a8a5
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index a146dae7a7b2..5044dd5db96c 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.8
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -16,22 +16,27 @@ checksum=9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

Re: open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1543786241

Comment:
@classabbyamp done

Re: [PR PATCH] [Updated] open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

There is an updated pull request by thetredev against master on the void-packages repository

https://github.com/thetredev/void-packages open-iscsi/add-runit-service
https://github.com/void-linux/void-packages/pull/42864

open-iscsi: add runit service
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes issue #40861 

A patch file from https://github.com/void-linux/void-packages/pull/42864.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-open-iscsi/add-runit-service-42864.patch --]
[-- Type: text/x-diff, Size: 2165 bytes --]

From e8dcbeaac6ff7e8bae241919164658610ac9cdb5 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 19 Mar 2023 17:40:05 +0100
Subject: [PATCH] open-iscsi: Add runit service

Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
 srcpkgs/open-iscsi/files/iscsid/run | 3 +++
 srcpkgs/open-iscsi/template         | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..6fc13d24a8a5
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec iscsid -f
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index f3de701055fc..b4530da1e081 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.9
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -16,22 +16,27 @@ checksum=60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -DGLOB_ONLYDIR=0 -D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;
 esac
+
 post_extract() {
 	vsed -i -e '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
 	vsed -i -e 's/lib64/lib/g' libopeniscsiusr/Makefile
 	vsed -i -e 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
 	vsed -i -e '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
+
 do_configure() {
 	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
+
 do_build() {
 	make ${makejobs} CC="$CC" \
 		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -pthread -DNO_SYSTEMD" \
 		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod) -pthread" NO_SYSTEMD=1
 }
+
 do_install() {
 	make install exec_prefix=/usr SBINDIR=/usr/bin RULESDIR=/usr/lib/udev/rules.d DESTDIR="$DESTDIR"
+	vsv iscsid
 
 	rm -rf ${DESTDIR}/usr/lib/systemd
 

Re: open-iscsi: add runit service

[thetredev]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New comment by thetredev on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1596167320

Comment:
fixed merge conflict

Re: open-iscsi: add runit service

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42864#issuecomment-1596226948

Comment:
cc @leahneukirchen 

Re: [PR PATCH] [Merged]: open-iscsi: add runit service

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

There's a merged pull request on the void-packages repository

open-iscsi: add runit service
https://github.com/void-linux/void-packages/pull/42864

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`

#### Notes
- This fixes #40861