Skip to content

Commit

Permalink
Revert "modules/nixos/common/update: use grub.extraInstallCommands fo…
Browse files Browse the repository at this point in the history
…r boot diff"

This reverts commit 01137d5.
  • Loading branch information
zowoq committed Dec 26, 2024
1 parent 3026577 commit 0dd66b1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
5 changes: 5 additions & 0 deletions modules/nixos/common/update.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ nix-env --profile /nix/var/nix/profiles/system --set "$p"
booted="$(readlink /run/booted-system/{initrd,kernel,kernel-modules} && cat /run/booted-system/kernel-params)"
built="$(readlink "$p"/{initrd,kernel,kernel-modules} && cat "$p"/kernel-params)"
if [[ $booted != "$built" ]]; then
if [[ -e /run/current-system ]]; then
echo "--- diff to current-system"
nvd diff /run/current-system "$p"
echo "---"
fi
/nix/var/nix/profiles/system/bin/switch-to-configuration boot
# don't use kexec if system is virtualized, reboots are fast enough
if ! systemd-detect-virt -q; then
Expand Down
11 changes: 1 addition & 10 deletions modules/nixos/common/update.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,11 @@
pkgs.coreutils
pkgs.curl
pkgs.kexec-tools
pkgs.nvd
];
script = builtins.readFile ./update.bash;
};

# https://gist.github.com/Ma27/6650d10f772511931647d3189b3eb1d7
# https://github.com/NuschtOS/nixos-modules/blob/39d26dddae2f117d7f9c33dd1efc866ff684ff94/modules/nix.nix
boot.loader.grub.extraInstallCommands = ''
if [[ "''${NIXOS_ACTION-}" == boot && -e /run/current-system && -e "''${1-}" ]]; then
echo "--- diff to current-system"
${pkgs.nvd}/bin/nvd --nix-bin-dir=${config.nix.package}/bin diff /run/current-system "''${1-}"
echo "---"
fi
'';

systemd.timers.update-host = {
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "5m";
Expand Down

0 comments on commit 0dd66b1

Please sign in to comment.