Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo when modifying the initiatorname (bsc#1233351) - master #141

Merged
merged 6 commits into from
Nov 14, 2024
Merged

Fix typo when modifying the initiatorname (bsc#1233351) - master #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a23deb7
Fix typo when modifying the initiatorname.
teclator Nov 14, 2024
9b8a6a8
Bump version & changelog
teclator Nov 14, 2024
7b55ada
Merge pull request #139 from yast/fix_typo
teclator Nov 14, 2024
eb8a1c2
Merge branch 'SLE-15-SP6' into merge_SLE-15-SP6
teclator Nov 14, 2024
4e05160
Merge pull request #140 from yast/merge_SLE-15-SP6
teclator Nov 14, 2024
bfcb2c7
Merge branch 'SLE-15-SP7' into merge_SLE-15-SP7
teclator Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions package/yast2-iscsi-client.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 14 09:13:29 UTC 2024 - Knut Anderssen <[email protected]>

- Fix typo introduced by previous change (bsc#1231385, bsc#1233351)
- 5.0.5

-------------------------------------------------------------------
Thu Oct 31 11:46:26 UTC 2024 - Knut Anderssen <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-iscsi-client.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-iscsi-client
Version: 5.0.4
Version: 5.0.5
Release: 0
Summary: YaST2 - iSCSI Client Configuration
License: GPL-2.0-only
Expand Down
15 changes: 8 additions & 7 deletions src/include/iscsi-client/widgets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def validateInitName(_key, event)
# "yyyy-mm" is the date at which the domain is valid and the identifier
# is freely selectable. For further details please check the iSCSI spec.

i_name = Convert.to_string(UI.QueryWidget(:initiator_name, :Value))
i_name = initiator_name_value

# name not changed at all or already saved after checking it
return true if IscsiClientLib.initiatorname == i_name
Expand Down Expand Up @@ -291,21 +291,22 @@ def iface_value
UI.QueryWidget(:iface, :Value).to_s
end

def initiator_name_value
UI.QueryWidget(:initiator_name, :Value).to_s
end

def storeInitName(_key, event)
event = deep_copy(event)
if Convert.to_string(UI.QueryWidget(:initiator_name, :Value)) !=
IscsiClientLib.initiatorname
if initiator_name_value != IscsiClientLib.initiatorname
# write initiatorname
IscsiClientLib.writeInitiatorName(
Convert.to_string(UI.QueryWidget(:initiator_name, :Value))
)
IscsiClientLib.writeInitiatorName(initiator_name_value)
# Isn't this redundant with the code at IscsiClientLib.writeInitiatorName?
if Stage.initial
IscsiClientLib.restart_iscsid_initial
else
Service.Restart("iscsid")
end
log.info "write initiatorname #{IscsientLib.initiatorname}"
log.info "write initiatorname #{IscsiClientLib.initiatorname}"
end
IscsiClientLib.iface = iface_value if iface_value != IscsiClientLib.selected_iface
nil
Expand Down
Loading