Add some syncs to reduce risk on machines that can power off unexpectedly

[auto-upgrade-with-pinch] / modules / auto-upgrade.nix

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index f3089bd7f75ff210017dd574d624b88ef79b9fb2..46e3e7f594e722f6c80ac6ceceb67a0f4a6c9e43 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -183,12 +183,16 @@ let
         # Build
         in_tmpdir hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build
         while read user;do
         # Build
         in_tmpdir hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build
         while read user;do

-          hydrate /run/wrappers/bin/sudo -u "$user" -D / \
+          pushd /
+          hydrate /run/wrappers/bin/sudo -u "$user" \

             ${pkgs.nix}/bin/nix-build --no-out-link '<nixpkgs>' -A "$(userenv_query "$user" .package)"
             ${pkgs.nix}/bin/nix-build --no-out-link '<nixpkgs>' -A "$(userenv_query "$user" .package)"

+          popd

         done < <( config_query '.userEnvironments | keys []' )
         done < <( config_query '.userEnvironments | keys []' )

+        sync

 
         # Install
         hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch
 
         # Install
         hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch

+        sync

         while read user;do
           remove_arg=-r
           if [[ "$(userenv_query "$user" .otherPackagesAction)" == keep ]];then
         while read user;do
           remove_arg=-r
           if [[ "$(userenv_query "$user" .otherPackagesAction)" == keep ]];then


@@ -196,6 +200,7 @@ let
           fi
           hydrate /run/wrappers/bin/sudo -u "$user" \
             ${pkgs.nix}/bin/nix-env -f '<nixpkgs>' $remove_arg -iA "$(userenv_query "$user" .package)"
           fi
           hydrate /run/wrappers/bin/sudo -u "$user" \
             ${pkgs.nix}/bin/nix-env -f '<nixpkgs>' $remove_arg -iA "$(userenv_query "$user" .package)"

+          sync

         done < <( config_query '.userEnvironments | keys []' )
       ''
     }
         done < <( config_query '.userEnvironments | keys []' )
       ''
     }