nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/iscsi-initiator: add option discoverType (#518475)

Browse Source
This commit is contained in:
Aaron Andersen
2026-09-30 20:25:09 +00:00
committed by GitHub
parent 9db3683c7c 519ddf2b0a
commit 292cbe88bc
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/networking/iscsi/initiator.nix
View File

@@ -20,6 +20,24 @@ in
default = null;
description = "Portal to discover targets on";
};
discoverType = mkOption {
description = ''
Target discovery type.
Change this if you want to discover your targes via an iSNS server
or use the targets provided via firmware settings.
See {manpage}`iscsiadm(8)`.
'';
default = "sendtargets";
example = "sendtargets";
type = enum [
"st"
"sendtargets"
"isns"
"fw"
];
};
name = mkOption {
type = str;
description = "Name of this iscsi initiator";
@@ -81,7 +99,7 @@ in
wantedBy = [ "remote-fs.target" ];
serviceConfig.ExecStartPre =
mkIf (cfg.discoverPortal != null)
"${cfg.package}/bin/iscsiadm --mode discoverydb --type sendtargets --portal ${escapeShellArg cfg.discoverPortal} --discover";
"${cfg.package}/bin/iscsiadm --mode discoverydb --type ${cfg.discoverType} --portal ${escapeShellArg cfg.discoverPortal} --discover";
};
environment.systemPackages = [ cfg.package ];

19
nixos/modules/services/networking/iscsi/root-initiator.nix
View File

@@ -43,6 +43,23 @@ in
type = nullOr str;
};
discoverType = mkOption {
description = ''
Target discovery type.
Change this if you want to discover your targes via an iSNS server
or use the targets provided via firmware settings.
See {manpage}`iscsiadm(8)`.
'';
default = "sendtargets";
example = "sendtargets";
type = enum [
"st"
"sendtargets"
"isns"
"fw"
];
};
target = mkOption {
description = ''
Name of the iSCSI target to boot from.
@@ -168,7 +185,7 @@ in
iscsid --foreground --no-pid-file --debug ${toString cfg.logLevel} &
iscsiadm --mode discoverydb \
--type sendtargets \
--type ${cfg.discoverType} \
--discover \
--portal ${escapeShellArg cfg.discoverPortal} \
--debug ${toString cfg.logLevel}