diff --git a/0153-use-red-hat-for-name.patch b/0153-use-anolis-for-name.patch similarity index 63% rename from 0153-use-red-hat-for-name.patch rename to 0153-use-anolis-for-name.patch index 27da7b163959d4f3fa53b138b24347b214b41739..c7420f1bac33f486f72d412c336e997551bad852 100644 --- a/0153-use-red-hat-for-name.patch +++ b/0153-use-anolis-for-name.patch @@ -1,7 +1,7 @@ -From 7f12a1ca8fe699958903278d010cf22d0a98767b Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Mon, 19 Nov 2012 16:40:04 -0800 -Subject: use red hat for name +From 1ddee25396962a6bd966b98311881ed6d4cba87c Fri Jan 29 00:00:00 2021 +From: Liwei Ge +Date: Fri, 29 Jan 2021 16:40:04 -0800 +Subject: [PATCH] use anolis for name --- doc/iscsi-iname.8 | 2 +- @@ -9,7 +9,7 @@ Subject: use red hat for name 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/iscsi-iname.8 b/doc/iscsi-iname.8 -index a55d666d1af3..dd77ed9f3165 100644 +index 6a413f6..dd77ed9 100644 --- a/doc/iscsi-iname.8 +++ b/doc/iscsi-iname.8 @@ -14,7 +14,7 @@ generates a unique iSCSI node name on every invocation. @@ -17,23 +17,23 @@ index a55d666d1af3..dd77ed9f3165 100644 .TP .BI [-p=]\fIprefix\fP -Use the prefix passed in instead of the default "iqn.2005-03.org.open-iscsi" -+Use the prefix passed in instead of the default "iqn.1994-05.com.redhat" ++Use the prefix passed in instead of the default "iqn.2020-08.org.openanolis" .SH AUTHORS Open-iSCSI project diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c -index 6347edc46293..cb2f6c8b8651 100644 +index da850dc..29aa4ad 100644 --- a/utils/iscsi-iname.c +++ b/utils/iscsi-iname.c -@@ -73,7 +73,7 @@ main(int argc, char *argv[]) +@@ -80,7 +80,7 @@ main(int argc, char *argv[]) exit(0); } } else { - prefix = "iqn.2005-03.org.open-iscsi"; -+ prefix = "iqn.1994-05.com.redhat"; ++ prefix = "iqn.2020-08.org.openanolis"; } /* try to feed some entropy from the pool to MD5 in order to get -- -2.9.5 +2.21.0 diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index dbb26e940eb2b7b2d154dd8ac9dfdde83bce67e0..21ffe31decfb77f48670adbf28f4560b2c21be0a 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,10 +1,11 @@ +%define anolis_release .0.1 %define open_iscsi_version 2.0 %define open_iscsi_build 874 Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 21%{?dist} +Release: 21%{anolis_release}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -77,7 +78,7 @@ Patch227: 0001-iscsid-Update-boot-gateway-information-during-sync_s.patch # distro specific modifications Patch351: 0151-update-initscripts-and-docs.patch Patch352: 0152-use-var-for-config.patch -Patch353: 0153-use-red-hat-for-name.patch +Patch353: 0153-use-anolis-for-name.patch Patch354: 0154-add-libiscsi.patch Patch356: 0156-remove-the-offload-boot-supported-ifdef.patch Patch359: 0159-iscsiuio-systemd-unit-files.patch @@ -332,6 +333,10 @@ fi %{_includedir}/libiscsi.h %changelog +* Fri Jan 07 Liwei Ge - 6.2.0.874-21.0.1 +- Use anolis for iqn name +- Cherry-pick [db8e2ae] + * Mon Aug 09 2021 Chris Leech - 6.2.0.874-21 - 1989972 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning