Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2021-10-30 23:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Sat Oct 30 23:13:21 2021 rev:111 rq:927854 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2021-10-11 15:30:17.754717863 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.1890/open-iscsi.changes 2021-10-30 23:14:30.071092380 +0200 @@ -1,0 +2,8 @@ +Mon Oct 25 22:43:23 UTC 2021 - Lee Duncan <[email protected]> + +- Fix the usr-merge changes (bsc#1192013). This includes catching + all the places that /sbin was still used directly, as well as + making the SPEC file build using /usr/sbin for openSUSE but + still use /sbin for SLE, for now. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.8YrVoZ/_old 2021-10-30 23:14:30.531092750 +0200 +++ /var/tmp/diff_new_pack.8YrVoZ/_new 2021-10-30 23:14:30.535092753 +0200 @@ -16,6 +16,11 @@ # +# ensure usr-merge does not effect existing SLE +%if ! 0%{?is_opensuse} +%define _sbindir /sbin +%endif + %define iscsi_minor_release 1 %define iscsi_patch_release 5 %define iscsi_patch_release_suse %{iscsi_patch_release}-suse ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.8YrVoZ/_old 2021-10-30 23:14:30.555092769 +0200 +++ /var/tmp/diff_new_pack.8YrVoZ/_new 2021-10-30 23:14:30.559092773 +0200 @@ -1,23 +1,70 @@ diff --git a/Makefile b/Makefile -index 4ccf706adcfd..dc1640ecb934 100644 +index 4ccf706adcfd..94b7b3e95e6d 100644 --- a/Makefile +++ b/Makefile -@@ -121,6 +121,10 @@ install_systemd: +@@ -6,6 +6,8 @@ + # that you want everything installed into. + DESTDIR ?= + ++SED = /usr/bin/sed ++ + prefix = /usr + exec_prefix = / + sbindir = $(exec_prefix)/sbin +@@ -61,7 +63,7 @@ endif + all: user + + user: iscsiuio/Makefile +- $(MAKE) -C libopeniscsiusr ++ $(MAKE) -C libopeniscsiusr SBINDIR=$(sbindir) + $(MAKE) -C utils/sysdeps + $(MAKE) -C utils/fwparam_ibft + $(MAKE) -C usr +@@ -114,6 +116,10 @@ install_user: install_programs install_doc install_etc \ + install_udev_rules: + $(INSTALL) -d $(DESTDIR)$(rulesdir) + $(INSTALL) -m 644 $(RULESFILES) $(DESTDIR)/$(rulesdir) ++ for f in $(RULESFILES); do \ ++ p=$(DESTDIR)/$(rulesdir)/$${f##*/}; \ ++ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ ++ done + + install_systemd: + $(INSTALL) -d $(DESTDIR)$(systemddir)/system +@@ -121,10 +127,18 @@ install_systemd: $(INSTALL) -d $(DESTDIR)$(systemddir)/system-generators $(INSTALL) -m 755 utils/ibft-rule-generator \ $(DESTDIR)$(systemddir)/system-generators + for f in $(SYSTEMDFILES); do \ + p=$(DESTDIR)/$(systemddir)/system/$${f##*/}; \ -+ sed -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ ++ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ + done - install_programs: $(PROGRAMS) $(SCRIPTS) +-install_programs: $(PROGRAMS) $(SCRIPTS) ++install_programs: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d $(DESTDIR)$(sbindir) + $(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir) ++ for f in $(SCRIPTS); do \ ++ p=$(DESTDIR)/$(sbindir)/$${f##*/}; \ ++ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ ++ done + + # ugh, auto-detection is evil + # Gentoo maintains their own init.d stuff +@@ -171,7 +185,7 @@ install_doc: $(MANPAGES) + + install_iname: + if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \ +- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ ++ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ + echo "***************************************************" ; \ + echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \ + echo "To override edit $(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \ diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service -index 34557bfa8a71..c1518b73f5e9 100644 +index 34557bfa8a71..cce2526f3b73 100644 --- a/etc/systemd/iscsi-init.service +++ b/etc/systemd/iscsi-init.service -@@ -1,6 +1,7 @@ +@@ -1,8 +1,9 @@ [Unit] Description=One time configuration for iscsid.service ConditionPathExists=!/etc/iscsi/initiatorname.iscsi @@ -25,6 +72,9 @@ [Service] Type=oneshot + RemainAfterExit=no +-ExecStart=/sbin/iscsi-gen-initiatorname ++ExecStart=@SBINDIR@/iscsi-gen-initiatorname diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service index 3d468b9f1ad7..8d30740d1b4c 100644 --- a/etc/systemd/iscsi.service @@ -72,6 +122,35 @@ KillMode=mixed Restart=on-failure +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index a9e461adda02..c921bfb6fe5f 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -11,6 +11,8 @@ endif + DESTDIR ?= + prefix ?= /usr + INSTALL ?= install ++exec_prefix = / ++sbindir = $(exec_prefix)/sbin + + ifndef LIB_DIR + ifeq ($(shell test -d /lib64 && echo 1),1) +@@ -25,6 +27,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig + MAN_DIR ?= $(prefix)/share/man + + PKG_CONFIG = /usr/bin/pkg-config ++SED = /usr/bin/sed + + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr + +@@ -48,6 +51,7 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o + CFLAGS ?= -O2 -g + CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) ++CFLAGS += -DSBINDIR=\"$(sbindir)\" + + LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) + diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c index b2524ed5f46b..6f57e457d78c 100644 --- a/libopeniscsiusr/idbm.c @@ -85,3 +164,85 @@ /* * Note: because we do not add the iface.iscsi_ifacename to +diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c +index 63f9c61f7529..05219092b0fe 100644 +--- a/libopeniscsiusr/iface.c ++++ b/libopeniscsiusr/iface.c +@@ -44,7 +44,10 @@ + #include "idbm.h" + #include "default.h" + +-#define ISCSIUIO_PATH "/sbin/iscsiuio" ++#ifndef SBINDIR ++#define SBINDIR "/sbin" ++#endif ++#define ISCSIUIO_PATH SBINDIR "/iscsiuio" + + struct _iscsi_net_drv { + const char *net_driver_name; // Ethernet driver. +diff --git a/utils/50-iscsi-firmware-login.rules b/utils/50-iscsi-firmware-login.rules +index 47b3cf96f38b..9fa1e7df0bed 100644 +--- a/utils/50-iscsi-firmware-login.rules ++++ b/utils/50-iscsi-firmware-login.rules +@@ -12,4 +12,4 @@ + # having it as one single line avoids those problems. + # + # DO NOT WRAP THIS LINE +-SUBSYSTEM=="iscsi_boot*", ACTION=="add", DEVPATH=="*/target*", RUN+="/sbin/iscsi_fw_login" ++SUBSYSTEM=="iscsi_boot*", ACTION=="add", DEVPATH=="*/target*", RUN+="@SBINDIR@/iscsi_fw_login" +diff --git a/utils/iscsi-gen-initiatorname b/utils/iscsi-gen-initiatorname +index 88bd43b38f4e..3e30465facb6 100644 +--- a/utils/iscsi-gen-initiatorname ++++ b/utils/iscsi-gen-initiatorname +@@ -1,10 +1,10 @@ + #!/bin/bash + # +-# /sbin/iscsi-gen-initiatorname ++# iscsi-gen-initiatorname + # + # Generate a default iSCSI Initiatorname for SUSE installations. + # +-# Copyright (c) 2011 Hannes Reinecke, SUSE Labs ++# Copyright (c) 2021 Hannes Reinecke, SUSE Labs + # This script is licensed under the GPL. + # + +@@ -27,7 +27,7 @@ if [ -f /etc/iscsi/initiatorname.iscsi -a -z "$FORCE" ] ; then + eval $(cat /etc/iscsi/initiatorname.iscsi | sed -e '/^#/d') + if [ "$iSCSI_INITIATOR_NAME" != "$InitiatorName" ] ; then + echo "iSCSI Initiatorname from iBFT is different from the current setting." +- echo "Please call '/sbin/iscsi-gen-initiatorname -f' to update the iSCSI Initiatorname." ++ echo "Please call '@SBINDIR@/iscsi-gen-initiatorname -f' to update the iSCSI Initiatorname." + exit 1 + fi + fi +@@ -45,7 +45,7 @@ if [ "$iSCSI_INITIATOR_NAME" ] ; then + ## Any change here will not be reflected to the iBFT BIOS tables. + ## If a different initiatorname is required please change the + ## initiatorname in the BIOS setup and call +-## /sbin/iscsi-gen-initiatorname -f ++## @SBINDIR@/iscsi-gen-initiatorname -f + ## to recreate an updated version of this file. + ## + InitiatorName=$iSCSI_INITIATOR_NAME +@@ -66,7 +66,7 @@ if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then + ## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. + EOF + ISSUEDATE="1996-04" +- INAME=$(/sbin/iscsi-iname -p iqn.$ISSUEDATE.de.suse:01) ++ INAME=$(@SBINDIR@/iscsi-iname -p iqn.$ISSUEDATE.de.suse:01) + printf "InitiatorName=$INAME\n" >>/etc/iscsi/initiatorname.iscsi + chmod 0600 /etc/iscsi/initiatorname.iscsi + fi +diff --git a/utils/iscsi_fw_login b/utils/iscsi_fw_login +index 1312ed372cef..aae9e4c00c2d 100755 +--- a/utils/iscsi_fw_login ++++ b/utils/iscsi_fw_login +@@ -7,6 +7,6 @@ + # + + ARGS="-m fw -l" +-ISCSIADM="/sbin/iscsiadm" ++ISCSIADM="@SBINDIR@/iscsiadm" + + $ISCSIADM $ARGS
