pyrox.dev
lol
nixos/iscsi: replace activationScript
Move the functionality into preStart of the systemd service.
+19
-17
+19
-17
nixos/modules/services/networking/iscsi/initiator.nix
+19
-17
nixos/modules/services/networking/iscsi/initiator.nix
···
52
52
'';
53
53
environment.etc."iscsi/initiatorname.iscsi".text = "InitiatorName=${cfg.name}";
54
54
55
-
system.activationScripts.iscsid = let
56
-
extraCfgDumper = optionalString (cfg.extraConfigFile != null) ''
57
-
if [ -f "${cfg.extraConfigFile}" ]; then
58
-
printf "\n# The following is from ${cfg.extraConfigFile}:\n"
59
-
cat "${cfg.extraConfigFile}"
60
-
else
61
-
echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2
62
-
fi
63
-
'';
64
-
in ''
65
-
(
66
-
cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source}
67
-
${extraCfgDumper}
68
-
) > /etc/iscsi/iscsid.conf
69
-
'';
70
-
71
55
systemd.packages = [ cfg.package ];
72
56
73
-
systemd.services."iscsid".wantedBy = [ "multi-user.target" ];
57
+
systemd.services."iscsid" = {
58
+
wantedBy = [ "multi-user.target" ];
59
+
preStart =
60
+
let
61
+
extraCfgDumper = optionalString (cfg.extraConfigFile != null) ''
62
+
if [ -f "${cfg.extraConfigFile}" ]; then
63
+
printf "\n# The following is from ${cfg.extraConfigFile}:\n"
64
+
cat "${cfg.extraConfigFile}"
65
+
else
66
+
echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2
67
+
fi
68
+
'';
69
+
in ''
70
+
(
71
+
cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source}
72
+
${extraCfgDumper}
73
+
) > /etc/iscsi/iscsid.conf
74
+
'';
75
+
};
74
76
systemd.sockets."iscsid".wantedBy = [ "sockets.target" ];
75
77
76
78
systemd.services."iscsi" = mkIf cfg.enableAutoLoginOut {