Compare commits
2 Commits
046937de27
...
64c3e2d720
Author | SHA1 | Date | |
---|---|---|---|
64c3e2d720 | |||
20d5fa29ae |
@ -120,7 +120,7 @@
|
||||
cpus = 12;
|
||||
threads = 2;
|
||||
};
|
||||
memory = 49152;
|
||||
memory = 40960;
|
||||
networks.vms.mac = "52:54:00:27:3d:5c";
|
||||
cleanShutdown.timeout = 120;
|
||||
drives = [ ] ++ (optionals (!config.my.build.isDevVM) [
|
||||
@ -160,7 +160,7 @@
|
||||
cpus = 12;
|
||||
threads = 2;
|
||||
};
|
||||
memory = 32768;
|
||||
memory = 40960;
|
||||
networks.vms.mac = "52:54:00:75:78:a8";
|
||||
cleanShutdown.timeout = 120;
|
||||
drives = [
|
||||
|
@ -15,16 +15,20 @@ let
|
||||
# Based on https://github.com/serokell/deploy-rs/blob/master/flake.nix
|
||||
nixosActivate = cfg': base: (pkgs.deploy-rs.lib.activate.custom // {
|
||||
dryActivate = "$PROFILE/bin/switch-to-configuration dry-activate";
|
||||
boot = "$PROFILE/bin/switch-to-configuration boot";
|
||||
boot = ''
|
||||
$PROFILE/bin/switch-to-configuration boot
|
||||
|
||||
${keepGensSnippet "$PROFILE" cfg'.keepGenerations}
|
||||
'';
|
||||
}) base.config.system.build.toplevel ''
|
||||
# work around https://github.com/NixOS/nixpkgs/issues/73404
|
||||
cd /tmp
|
||||
|
||||
"$PROFILE"/bin/switch-to-configuration ${cfg'.mode}
|
||||
"$PROFILE"/bin/switch-to-configuration switch
|
||||
|
||||
# https://github.com/serokell/deploy-rs/issues/31
|
||||
${with base.config.boot.loader;
|
||||
optionalString ((cfg'.mode == "switch" || cfg'.mode == "boot") && systemd-boot.enable)
|
||||
optionalString systemd-boot.enable
|
||||
"sed -i '/^default /d' ${efi.efiSysMountPoint}/loader/loader.conf"}
|
||||
|
||||
${keepGensSnippet "$PROFILE" cfg'.keepGenerations}
|
||||
@ -59,7 +63,11 @@ let
|
||||
{
|
||||
name = "container-${n}";
|
||||
value = {
|
||||
path = pkgs.deploy-rs.lib.activate.custom ctrConfig.my.buildAs.container ''
|
||||
path = (pkgs.deploy-rs.lib.activate.custom // {
|
||||
boot = ''
|
||||
echo "Next systemd-nspawn@${n}.service restart / reload will load config"
|
||||
'';
|
||||
}) ctrConfig.my.buildAs.container ''
|
||||
source ${systemdUtil}/bin/systemd-util.sh
|
||||
${if c.hotReload then ''
|
||||
if (! systemctl show -p ActiveState systemd-nspawn@${n} | grep -q "ActiveState=active") || \
|
||||
|
Loading…
x
Reference in New Issue
Block a user