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

Explicitly pass 'daemon' to determinate-nixd #1159

Merged
merged 5 commits into from
Sep 12, 2024
Merged

Explicitly pass 'daemon' to determinate-nixd #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
696e1c7
flake.lock: Update determinate and determinate-nixd binaries
cole-h Sep 12, 2024
903cfac
Explicitly pass 'daemon' to determinate-nixd
grahamc Sep 10, 2024
eb0a939
fmt
grahamc Sep 10, 2024
f791082
fixup: also specify daemon in systemd unit
cole-h Sep 12, 2024
9c6b615
fixup: missing daemon
cole-h Sep 12, 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
28 changes: 14 additions & 14 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/action/common/configure_determinate_nixd_init_service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub enum ConfigureDeterminateNixDaemonServiceError {}
#[serde(rename_all = "PascalCase")]
pub struct DeterminateNixDaemonPlist {
label: String,
program: String,
program_arguments: Vec<String>,
run_at_load: bool,
sockets: HashMap<String, Socket>,
standard_error_path: String,
Expand Down Expand Up @@ -223,7 +223,7 @@ fn generate_plist() -> DeterminateNixDaemonPlist {
DeterminateNixDaemonPlist {
run_at_load: false,
label: "systems.determinate.nix-daemon".into(),
program: "/usr/local/bin/determinate-nixd".into(),
program_arguments: vec!["/usr/local/bin/determinate-nixd".into(), "daemon".into()],
standard_error_path: "/var/log/determinate-nix-daemon.log".into(),
standard_out_path: "/var/log/determinate-nix-daemon.log".into(),
soft_resource_limits: ResourceLimits {
Expand Down
2 changes: 1 addition & 1 deletion ...action/common/configure_determinate_nixd_init_service/nix-daemon.determinate-nixd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RequiresMountsFor=/nix/var/nix/db
ConditionPathIsReadWrite=/nix/var/nix/daemon-socket

[Service]
ExecStart=@/usr/local/bin/determinate-nixd determinate-nixd
ExecStart=@/usr/local/bin/determinate-nixd determinate-nixd daemon
KillMode=process
LimitNOFILE=1048576
LimitSTACK=64M
Expand Down
2 changes: 1 addition & 1 deletion src/action/macos/create_determinate_nix_volume.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl Action for CreateDeterminateNixVolume {
.map_err(Self::error)?;

let mut command = Command::new("/usr/local/bin/determinate-nixd");
command.args(["--stop-after", "mount"]);
command.args(["--stop-after", "mount", "daemon"]);
command.stderr(std::process::Stdio::piped());
command.stdout(std::process::Stdio::piped());
tracing::trace!(command = ?command.as_std(), "Mounting /nix");
Expand Down
1 change: 1 addition & 0 deletions src/action/macos/create_determinate_volume_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ async fn generate_mount_plist(
"/usr/local/bin/determinate-nixd".into(),
"--stop-after".into(),
"mount".into(),
"daemon".into(),
],
standard_out_path: "/var/log/determinate-nixd-mount.log".into(),
standard_error_path: "/var/log/determinate-nixd-mount.log".into(),
Expand Down
Loading