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

Jump to bottom

storage: Never enable iSCSI in Anaconda mode #20951

Closed
wants to merge 1 commit into from
Closed

storage: Never enable iSCSI in Anaconda mode #20951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions pkg/storaged/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,13 +895,15 @@ function init_model(callback) {
console.warn("Can't enable storaged btrfs module", error.toString());
}

try {
await client.manager.EnableModule("iscsi", true);
client.manager_iscsi = proxy("Manager.ISCSI.Initiator", "Manager");
await client.manager_iscsi.wait();
client.features.iscsi = (client.manager_iscsi.valid && client.manager_iscsi.SessionsSupported !== false);
} catch (error) {
console.warn("Can't enable storaged iscsi module", error.toString());
if (!client.in_anaconda_mode()) {
try {
await client.manager.EnableModule("iscsi", true);
client.manager_iscsi = proxy("Manager.ISCSI.Initiator", "Manager");
await client.manager_iscsi.wait();
client.features.iscsi = (client.manager_iscsi.valid && client.manager_iscsi.SessionsSupported !== false);
} catch (error) {
console.warn("Can't enable storaged iscsi module", error.toString());
Comment on lines +904 to +905
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 2 added lines are not executed by any test.

}
}

try {
Expand Down