diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | src/bin/activate.rs | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -80,7 +80,14 @@ ]; }; - nixos = base: custom base.config.system.build.toplevel "$PROFILE/bin/switch-to-configuration switch"; + nixos = base: custom base.config.system.build.toplevel '' + $PROFILE/bin/switch-to-configuration switch + + # https://github.com/serokell/deploy-rs/issues/31 + ${with base.config.boot.loader; + pkgs.lib.optionalString systemd-boot.enable + "sed -i '/^default /d' ${efi.efiSysMountPoint}/loader/loader.conf"} + ''; noop = base: custom base ":"; }; diff --git a/src/bin/activate.rs b/src/bin/activate.rs index bf8c907..2f13b44 100644 --- a/src/bin/activate.rs +++ b/src/bin/activate.rs @@ -318,7 +318,7 @@ pub async fn wait(temp_path: String, closure: String) -> Result<(), WaitError> { return Ok(()); } - danger_zone(done, 60).await?; + danger_zone(done, 240).await?; info!("Found canary file, done waiting!"); |