Skip to content

Commit 8c5f787

Browse files
committed
CreateNixVolume: use constant for darwin-store service label
1 parent 229832d commit 8c5f787

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/action/macos/create_nix_volume.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use super::{
1919
};
2020

2121
pub const NIX_VOLUME_MOUNTD_DEST: &str = "/Library/LaunchDaemons/org.nixos.darwin-store.plist";
22+
pub const NIX_VOLUME_MOUNTD_NAME: &str = "org.nixos.darwin-store";
2223

2324
/// Create an APFS volume
2425
#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
@@ -88,7 +89,7 @@ impl CreateNixVolume {
8889

8990
let setup_volume_daemon = CreateVolumeService::plan(
9091
NIX_VOLUME_MOUNTD_DEST,
91-
"org.nixos.darwin-store",
92+
NIX_VOLUME_MOUNTD_NAME,
9293
name.clone(),
9394
"/nix",
9495
encrypt,
@@ -97,11 +98,11 @@ impl CreateNixVolume {
9798
.map_err(Self::error)?;
9899

99100
let bootstrap_volume =
100-
BootstrapLaunchctlService::plan("org.nixos.darwin-store", NIX_VOLUME_MOUNTD_DEST)
101+
BootstrapLaunchctlService::plan(NIX_VOLUME_MOUNTD_NAME, NIX_VOLUME_MOUNTD_DEST)
101102
.await
102103
.map_err(Self::error)?;
103104
let kickstart_launchctl_service =
104-
KickstartLaunchctlService::plan(DARWIN_LAUNCHD_DOMAIN, "org.nixos.darwin-store")
105+
KickstartLaunchctlService::plan(DARWIN_LAUNCHD_DOMAIN, NIX_VOLUME_MOUNTD_NAME)
105106
.await
106107
.map_err(Self::error)?;
107108
let enable_ownership = EnableOwnership::plan("/nix").await.map_err(Self::error)?;

0 commit comments

Comments
 (0)