diff options
| author | Lee Duncan <lduncan@suse.com> | 2022-02-19 11:30:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 11:30:23 -0800 |
| commit | e3a5f4d1be0838398c8ce8fa883a060a200f7697 (patch) | |
| tree | 379e3b7146c4ba421f7471142d6edc1ac7d55653 | |
| parent | ee575fd19429ec6dc24b49f2ce3822b4a01f57de (diff) | |
| parent | cf4698fd0cc1348993ecef685c2639ac1705758f (diff) | |
| download | open-iscsi-e3a5f4d1be0838398c8ce8fa883a060a200f7697.tar.gz | |
Merge pull request #305 from gonzoleeman/fix-iscsi-gen-initiatorname
Remove HEREIS usage from iscsi-gen-initiatorname
| -rwxr-xr-x | utils/iscsi-gen-initiatorname | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/utils/iscsi-gen-initiatorname b/utils/iscsi-gen-initiatorname index e182f8a..70ad8bf 100755 --- a/utils/iscsi-gen-initiatorname +++ b/utils/iscsi-gen-initiatorname @@ -4,7 +4,7 @@ # # Generate a default iSCSI Initiatorname for SUSE installations. # -# Copyright (c) 2021 Hannes Reinecke, SUSE Labs +# Copyright (c) 2022 Hannes Reinecke, SUSE Labs # This script is licensed under the GPL. # @@ -12,6 +12,29 @@ NAME="$0" INAME_FILE="/etc/iscsi/initiatorname.iscsi" IQN_PREFIX="iqn.1996-04.de.suse:01" +IBFT_COMMENTS="\ +## +## iSCSI Initiatorname taken from iBFT BIOS tables. +## +## DO NOT EDIT OR REMOVE THIS FILE! +## If you remove this file, the iSCSI daemon will not start. +## 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 +## @SBINDIR@/iscsi-gen-initiatorname -f +## to recreate an updated version of this file. +##" + +NORMAL_COMMENTS="\ +## +## Default iSCSI Initiatorname. +## +## DO NOT EDIT OR REMOVE THIS FILE! +## If you remove this file, the iSCSI daemon will not start. +## If you change the InitiatorName, existing access control lists +## may reject this initiator. The InitiatorName must be unique +## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames." + usage_and_exit() { xit_val=$1 @@ -62,19 +85,7 @@ fi if [ "$iSCSI_INITIATOR_NAME" ] ; then echo "##" > $INAME_FILE || exit 1 echo "## $INAME_FILE" >> $INAME_FILE - cat << EOF >> $INAME_FILE -## -## iSCSI Initiatorname taken from iBFT BIOS tables. -## -## DO NOT EDIT OR REMOVE THIS FILE! -## If you remove this file, the iSCSI daemon will not start. -## 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 -## @SBINDIR@/iscsi-gen-initiatorname -f -## to recreate an updated version of this file. -## -EOF + echo "$IBFT_COMMENTS" >> $INAME_FILE echo "InitiatorName=$iSCSI_INITIATOR_NAME" >> $INAME_FILE chmod 0600 $INAME_FILE fi @@ -83,19 +94,9 @@ fi if [ ! -f $INAME_FILE ] ; then echo "##" > $INAME_FILE || exit 1 echo "## $INAME_FILE" >> $INAME_FILE - cat << EOF >> $INAME_FILE -## -## Default iSCSI Initiatorname. -## -## DO NOT EDIT OR REMOVE THIS FILE! -## If you remove this file, the iSCSI daemon will not start. -## If you change the InitiatorName, existing access control lists -## may reject this initiator. The InitiatorName must be unique -## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. -EOF + echo "$NORMAL_COMMENTS" >> $INAME_FILE # create a unique initiator name using iscsi-iname INAME=$(@SBINDIR@/iscsi-iname -p "$IQN_PREFIX") echo "InitiatorName=$INAME" >> $INAME_FILE chmod 0600 $INAME_FILE fi - |