[rpms/iscsi-initiator-utils] rawhide: Use iscsi-gen-initiatorname in iscsi-init

[rpms/iscsi-initiator-utils] rawhide: Use iscsi-gen-initiatorname in iscsi-init

[Jesse Taube]

            A new commit has been pushed.

            Repo   : rpms/iscsi-initiator-utils
            Branch : rawhide
            Commit : 4342fde4394f093bef6746f2fcd4829b5ae814ba
            Author : Jesse Taube <jtaubepe@redhat.com>
            Date   : 2026-07-08T14:09:37-04:00
            Stats  : +97/-2 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/iscsi-initiator-utils/c/4342fde4394f093bef6746f2fcd4829b5ae814ba?branch=rawhide

            Log:
            Use iscsi-gen-initiatorname in iscsi-init

Signed-off-by: Jesse Taube <jtaubepe@redhat.com>

---
diff --git a/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch b/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
new file mode 100644
index 0000000..2f5f7bd
--- /dev/null
+++ b/0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
@@ -0,0 +1,52 @@
+From 880337d6e3feef3bba39a80b06c7f9021131de51 Mon Sep 17 00:00:00 2001
+From: Jesse Taube <jtaubepe@redhat.com>
+Date: Mon, 22 Jun 2026 13:44:50 -0400
+Subject: [PATCH 1/2] iscsi-gen-initiatorname use @IQN_PREFIX@ as default
+
+change iscsi-gen-initiatorname.sh.template to use a configurable default
+IQN prefix instead of hardcoding one, using the @IQN_PREFIX@ variable.
+
+Signed-off-by: Jesse Taube <jtaubepe@redhat.com>
+---
+ utils/Makefile                            | 4 ++--
+ utils/iscsi-gen-initiatorname.sh.template | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index 2cc41d4..46b3223 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -18,7 +18,7 @@ HOMEDIR ?= $(etcdir)/iscsi
+ 
+ RULESDIR ?= $(etcdir)/udev/rules.d
+ 
+-IQN_PREFIX ?= "iqn.2016-04.com.open-iscsi"
++IQN_PREFIX ?= iqn.2016-04.com.open-iscsi
+ 
+ CFLAGS ?= -O2 -fno-inline -g
+ CFLAGS += -Wall -Wextra -Wstrict-prototypes
+@@ -42,7 +42,7 @@ OBJS = iscsi-iname.o md5.o
+ all: $(PROGRAMS) $(SCRIPTS_GENERATED) $(RULESFILES_GENERATED)
+ 
+ $(SCRIPTS_GENERATED): %.sh: %.sh.template
+-	$(SED) -e 's:@SBINDIR@:$(SBINDIR):' -e 's:@HOMEDIR@:$(HOMEDIR):' $? > $@
++	$(SED) -e 's:@SBINDIR@:$(SBINDIR):' -e 's:@HOMEDIR@:$(HOMEDIR):' -e 's:@IQN_PREFIX@:$(IQN_PREFIX):' $? > $@
+ 	$(CHMOD) 755 $@
+ 
+ $(RULESFILES_GENERATED): %.rules: %.rules.template
+diff --git a/utils/iscsi-gen-initiatorname.sh.template b/utils/iscsi-gen-initiatorname.sh.template
+index 5c2bfdf..e533f0f 100644
+--- a/utils/iscsi-gen-initiatorname.sh.template
++++ b/utils/iscsi-gen-initiatorname.sh.template
+@@ -16,7 +16,7 @@ INAME_DIR="@HOMEDIR@"
+ INAME_FILE="$INAME_DIR/initiatorname.iscsi"
+ 
+ # our default IQN prefix
+-DEFAULT_IQN_PREFIX="iqn.1996-04.de.suse:01"
++DEFAULT_IQN_PREFIX="@IQN_PREFIX@"
+ 
+ #
+ # set up comments for initiatorname files using variables
+-- 
+2.54.0
+

diff --git a/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch b/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
new file mode 100644
index 0000000..11c5f97
--- /dev/null
+++ b/0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
@@ -0,0 +1,41 @@
+From b5b9609a273afaf91532afcfde89a01bb1b69ac6 Mon Sep 17 00:00:00 2001
+From: Jesse Taube <jtaubepe@redhat.com>
+Date: Mon, 22 Jun 2026 14:01:27 -0400
+Subject: [PATCH 2/2] iscsi-init.service: Use iscsi-gen-initiatorname
+
+The iscsi-init.service should use iscsi-gen-initiatorname to generate
+the initiatorname.iscsi file if it doesn't exist. This is more portable
+then generating it with iscsi-iname.
+
+Signed-off-by: Jesse Taube <jtaubepe@redhat.com>
+---
+ doc/iscsi-gen-initiatorname.8.template  | 2 +-
+ etc/systemd/iscsi-init.service.template | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/iscsi-gen-initiatorname.8.template b/doc/iscsi-gen-initiatorname.8.template
+index 97a6e21..d930a16 100644
+--- a/doc/iscsi-gen-initiatorname.8.template
++++ b/doc/iscsi-gen-initiatorname.8.template
+@@ -36,7 +36,7 @@ Force overwrite of existing initiator name, if present.
+ .TP
+ .BI [-p] \fIIQN-PREFIX\fP
+ Use \fIIQN-PREFIX\fP as the prefix to the IQN generated,
+-instead of the default of \fBiqn.1996-04.de.suse:01\fP.
++instead of the default of \fB@IQN_PREFIX@\fP.
+ .SH FILES
+ .TP
+ @HOMEDIR@/initiatorname.iscsi
+diff --git a/etc/systemd/iscsi-init.service.template b/etc/systemd/iscsi-init.service.template
+index 8f9a8aa..c26c871 100644
+--- a/etc/systemd/iscsi-init.service.template
++++ b/etc/systemd/iscsi-init.service.template
+@@ -16,4 +16,4 @@ WantedBy=systemd-remount-fs.service
+ [Service]
+ Type=oneshot
+ RemainAfterExit=no
+-ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
++ExecStart=@SBINDIR@/iscsi-gen-initiatorname
+-- 
+2.54.0
+

diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 0223c69..0159302 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -35,6 +35,8 @@ Patch07: 0007-Disable-Data-Digests.patch
 Patch08: 0008-Revert-iscsiadm-return-error-when-login-fails.patch
 Patch09: 0009-Coverity-scan-fixes.patch
 Patch10: 0010-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+Patch11: 0011-iscsi-gen-initiatorname-use-IQN_PREFIX-as-default.patch
+Patch12: 0012-iscsi-init.service-Use-iscsi-gen-initiatorname.patch
 
 # libiscsi, deprecated but still needed until UDisks2 is converted to libopeniscsiusr
 Patch101: 0101-libiscsi.patch
@@ -133,11 +135,9 @@ rm $RPM_BUILD_ROOT/etc/iscsi/initiatorname.iscsi
 rm $RPM_BUILD_ROOT/etc/udev/rules.d/50-iscsi-firmware-login.rules
 rm $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/ibft-rule-generator
 rm $RPM_BUILD_ROOT/%{_sbindir}/brcm_iscsiuio
-rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi-gen-initiatorname
 rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi_discovery
 rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi_fw_login
 rm $RPM_BUILD_ROOT/%{_sbindir}/iscsi_offload
-rm $RPM_BUILD_ROOT/usr/share/man/man8/iscsi-gen-initiatorname.8
 rm $RPM_BUILD_ROOT/usr/share/man/man8/iscsi_discovery.8
 rm $RPM_BUILD_ROOT/usr/share/man/man8/iscsi_fw_login.8
 rm $RPM_BUILD_ROOT/var/lib/iscsi/ifaces/iface.example
@@ -209,11 +209,13 @@ systemctl --no-reload preset iscsi.service iscsi-starter.service &>/dev/null || 
 %dir %{_sysconfdir}/iscsi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
 %{_sbindir}/iscsi-iname
+%{_sbindir}/iscsi-gen-initiatorname
 %{_sbindir}/iscsiadm
 %{_sbindir}/iscsid
 %{_sbindir}/iscsistart
 %{_libdir}/libiscsi.so.0
 %{_mandir}/man8/iscsi-iname.8.gz
+%{_mandir}/man8/iscsi-gen-initiatorname.8.gz
 %{_mandir}/man8/iscsiadm.8.gz
 %{_mandir}/man8/iscsid.8.gz
 %{_mandir}/man8/iscsistart.8.gz