Hello community, here is the log from the commit of package open-iscsi for openSUSE:Leap:15.2 checked in at 2020-05-12 11:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/open-iscsi (Old) and /work/SRC/openSUSE:Leap:15.2/.open-iscsi.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Tue May 12 11:31:45 2020 rev:53 rq:801265 version:unknown Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/open-iscsi/open-iscsi.changes 2020-04-08 12:48:34.578348289 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.open-iscsi.new.2738/open-iscsi.changes 2020-05-12 11:32:02.731699642 +0200 @@ -1,0 +2,27 @@ +Sat May 2 15:06:18 UTC 2020 - Lee Duncan <[email protected]> + +- Update SPEC file to handle the fact that the + service_del_postun_without_restart RPM macro exists + in factory but not in SLE. No functional change + for factory. + +------------------------------------------------------------------- +Tue Apr 7 19:21:38 UTC 2020 - Lee Duncan <[email protected]> + +- Updated service_del_preun and service_del_postun for iscsi and + iscsiuio packges in SPEC file, so that services get started/ + stopped in the correct order, and changed systemd macros so + that iscsi login service iscsi.service is not restarted during + package upgrade (bsc#1166650) + +------------------------------------------------------------------- +Wed Apr 1 18:38:30 UTC 2020 - Lee Duncan <[email protected]> + +- Update with two upstream commits: + * Fix issue where "iscsi-iname -p" core dumps. (found upstream) + * Fix iscsi.service so it handles restarts better (bsc#1163499) + * Add Wants=remote-fs-pre.target for sequencing. (bsc#1158536) + updating: + * open-iscsi-SUSE-latest.diff.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.uFemuC/_old 2020-05-12 11:32:03.235700701 +0200 +++ /var/tmp/diff_new_pack.uFemuC/_new 2020-05-12 11:32:03.239700709 +0200 @@ -143,34 +143,39 @@ if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi -%{service_add_post iscsid.socket iscsid.service iscsi.service} +%service_add_post iscsi.service iscsid.service iscsid.socket %posttrans %{?regenerate_initrd_posttrans} %postun -%{service_del_postun iscsid.socket iscsid.service iscsi.service} +%if %{defined service_del_postun_without_restart} + %service_del_postun_without_restart iscsi.service +%else + %service_del_postun -n iscsi.service +%endif +%service_del_postun iscsid.service iscsid.socket %pre -%{service_add_pre iscsid.socket iscsid.service iscsi.service} +%service_add_pre iscsi.service iscsid.service iscsid.socket %preun -%{service_del_preun iscsid.socket iscsid.service iscsi.service} +%service_del_preun iscsi.service iscsid.service iscsid.socket %post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig %postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig %post -n iscsiuio -%{service_add_post iscsiuio.socket iscsiuio.service} +%service_add_post iscsiuio.service iscsiuio.socket %postun -n iscsiuio -%{service_del_postun iscsiuio.socket iscsiuio.service} +%service_del_postun iscsiuio.service iscsiuio.socket %pre -n iscsiuio -%{service_add_pre iscsiuio.socket iscsiuio.service} +%service_add_pre iscsiuio.service iscsiuio.socket %preun -n iscsiuio -%{service_del_preun iscsiuio.socket iscsiuio.service} +%service_del_preun iscsiuio.service iscsiuio.socket %files %dir %{_sysconfdir}/iscsi ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.uFemuC/_old 2020-05-12 11:32:03.263700759 +0200 +++ /var/tmp/diff_new_pack.uFemuC/_new 2020-05-12 11:32:03.271700776 +0200 @@ -0,0 +1,99 @@ +diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service +index e4758881cb9c..1c286d1fdeda 100644 +--- a/etc/systemd/iscsi.service ++++ b/etc/systemd/iscsi.service +@@ -3,7 +3,7 @@ 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 ++Requires=iscsid.socket + ConditionPathExists=/etc/iscsi/initiatorname.iscsi + + [Service] +@@ -11,7 +11,7 @@ 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 ++SuccessExitStatus=21 15 + RemainAfterExit=true + + [Install] +diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service +index 4fef168163ca..648ceeaa0f07 100644 +--- a/etc/systemd/iscsid.service ++++ b/etc/systemd/iscsid.service +@@ -4,6 +4,7 @@ Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) + DefaultDependencies=no + After=network.target iscsiuio.service + Before=remote-fs-pre.target ++Wants=remote-fs-pre.target + + [Service] + Type=notify +diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service +index e4d9fd0f916a..923e01978cf4 100644 +--- a/etc/systemd/iscsiuio.service ++++ b/etc/systemd/iscsiuio.service +@@ -7,6 +7,7 @@ Requires=iscsid.service + BindTo=iscsid.service + After=network.target + Before=remote-fs-pre.target iscsid.service ++Wants=remote-fs-pre.target + + [Service] + Type=notify +diff --git a/utils/Makefile b/utils/Makefile +index f65f1e79008c..aed3bb0a694f 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -1,7 +1,7 @@ + # This Makefile will work only with GNU make. + + CFLAGS ?= -O2 -fno-inline -g +-CFLAGS += -Wall -Wstrict-prototypes ++CFLAGS += -Wall -Wextra -Wstrict-prototypes + PROGRAMS = iscsi-iname + + all: $(PROGRAMS) +diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c +index da850dca0088..0f587e1e0d36 100644 +--- a/utils/iscsi-iname.c ++++ b/utils/iscsi-iname.c +@@ -40,6 +40,13 @@ + * a seperator and 12 characters (6 random bytes in hex representation) */ + #define PREFIX_MAX_LEN 210 + ++static void usage(void) ++{ ++ fprintf(stderr, "Usage: iscsi-iname [-h | --help | -p <prefix>]\n"); ++ fprintf(stderr, "where <prefix> has max length of %d\n", ++ PREFIX_MAX_LEN); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -68,15 +75,17 @@ main(int argc, char *argv[]) + "on every invocation.\n"); + exit(0); + } else if ( strcmp(prefix, "-p") == 0 ) { ++ if (argc != 3) { ++ usage(); ++ exit(1); ++ } + prefix = argv[2]; + if (strnlen(prefix, PREFIX_MAX_LEN + 1) > PREFIX_MAX_LEN) { +- printf("Error: Prefix cannot exceed %d " +- "characters.\n", PREFIX_MAX_LEN); ++ usage(); + exit(1); + } + } else { +- printf("\nUsage: iscsi-iname [-h | --help | " +- "-p <prefix>]\n"); ++ usage(); + exit(0); + } + } else {
