diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-03-05 00:37:03 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-03-05 00:37:03 +0100 |
commit | 0c9152bd668e599bf1f3b0f95e48bc07e649ac25 (patch) | |
tree | 7970cdb60fe7ba614beda1c696d72748dd1d5e20 | |
parent | 485354e5289157cea4de521b5ff13aae9f85a02d (diff) | |
download | Nix-0c9152bd668e599bf1f3b0f95e48bc07e649ac25.tar.gz Nix-0c9152bd668e599bf1f3b0f95e48bc07e649ac25.tar.zst Nix-0c9152bd668e599bf1f3b0f95e48bc07e649ac25.zip |
Add next-boot recipe to makefile
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | nixops/Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -1,6 +1,6 @@ | |||
1 | subrecipes = setup nix-info edit_env | 1 | subrecipes = setup nix-info edit_env |
2 | subrecipes += ssh-eldiron ssh-backup-2 ssh-monitoring-1 ssh-4c | 2 | subrecipes += ssh-eldiron ssh-backup-2 ssh-monitoring-1 ssh-4c |
3 | subrecipes += debug build dry-run upload deploy deploy-reboot | 3 | subrecipes += debug build dry-run upload deploy next-boot deploy-reboot |
4 | subrecipes += list-generations delete-generations cleanup | 4 | subrecipes += list-generations delete-generations cleanup |
5 | ${subrecipes}: | 5 | ${subrecipes}: |
6 | @$(MAKE) --no-print-directory -C nixops/ $@ | 6 | @$(MAKE) --no-print-directory -C nixops/ $@ |
diff --git a/nixops/Makefile b/nixops/Makefile index f232e8a..f3d06ef 100644 --- a/nixops/Makefile +++ b/nixops/Makefile | |||
@@ -59,6 +59,10 @@ deploy: | |||
59 | ./scripts/with_env morph deploy default.nix switch --keep-result --upload-secrets $(MORPH_ARGS) | 59 | ./scripts/with_env morph deploy default.nix switch --keep-result --upload-secrets $(MORPH_ARGS) |
60 | nix-env -p $(PROFILE) --set .gcroots/default.nix | 60 | nix-env -p $(PROFILE) --set .gcroots/default.nix |
61 | 61 | ||
62 | next-boot: | ||
63 | ./scripts/with_env morph deploy default.nix boot --keep-result --upload-secrets $(MORPH_ARGS) | ||
64 | nix-env -p $(PROFILE) --set .gcroots/default.nix | ||
65 | |||
62 | deploy-reboot: | 66 | deploy-reboot: |
63 | ./scripts/with_env morph deploy default.nix boot --reboot --upload-secrets $(MORPH_ARGS) | 67 | ./scripts/with_env morph deploy default.nix boot --reboot --upload-secrets $(MORPH_ARGS) |
64 | 68 | ||