s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Register store paths in the nix DB at bootup of the VM.

Browse source
This commit is contained in:
r-vdp 2023-06-06 01:26:19 +02:00
parent 7789f31548
commit 9403324ea4
No known key found for this signature in database
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nix/lib.nix
View file

@ -104,7 +104,7 @@ in
}; };
registerProfileScript = pkgs.writeShellScript "register-profile" '' registerProfileScript = pkgs.writeShellScript "register-profile" ''
${system-manager}/bin/system-manager generate \ ${system-manager}/bin/system-manager register \
--store-path "$(dirname $(realpath $(dirname ''${0})))" \ --store-path "$(dirname $(realpath $(dirname ''${0})))" \
"$@" "$@"
''; '';
@ -253,7 +253,10 @@ in
# Careful since we do not have the nix store yet when this service runs, # Careful since we do not have the nix store yet when this service runs,
# so we cannot use pkgs.writeTest or pkgs.writeShellScript for instance, # so we cannot use pkgs.writeTest or pkgs.writeShellScript for instance,
# since their results would refer to the store # since their results would refer to the store
mount_store = { pkgs }: mount_store = { pkgs, pathsToRegister }:
let
pathRegistrationInfo = "${pkgs.closureInfo { rootPaths = pathsToRegister; }}/registration";
in
pkgs.writeText "mount-store.service" '' pkgs.writeText "mount-store.service" ''
[Service] [Service]
Type = oneshot Type = oneshot
@ -264,6 +267,12 @@ in
ExecStart = mkdir -p -m 0755 /nix/.rw-store/store /nix/.rw-store/work ExecStart = mkdir -p -m 0755 /nix/.rw-store/store /nix/.rw-store/work
ExecStart = mount -t overlay overlay /nix/store -o lowerdir=/nix/.ro-store,upperdir=/nix/.rw-store/store,workdir=/nix/.rw-store/work ExecStart = mount -t overlay overlay /nix/store -o lowerdir=/nix/.ro-store,upperdir=/nix/.rw-store/store,workdir=/nix/.rw-store/work
# Register the required paths in the nix DB.
# The store has been mounted at this point, to we can use writeShellScript now.
ExecStart = ${pkgs.writeShellScript "execstartpost-script" ''
${lib.getBin pkgs.nix}/bin/nix-store --load-db < ${pathRegistrationInfo}
''}
[Install] [Install]
WantedBy = multi-user.target WantedBy = multi-user.target
''; '';
@ -315,7 +324,7 @@ in
WantedBy = multi-user.target WantedBy = multi-user.target
''; '';
prepareUbuntuImage = { hostPkgs, nodeConfig, image }: prepareUbuntuImage = { hostPkgs, nodeConfig, image, extraPathsToRegister ? [ ] }:
let let
pkgs = hostPkgs; pkgs = hostPkgs;
@ -325,6 +334,9 @@ in
}; };
resultImg = "./image.qcow2"; resultImg = "./image.qcow2";
# The nix store paths that need to be added to the nix DB for this node.
pathsToRegister = [ nodeConfig.systemConfig ] ++ extraPathsToRegister;
in in
pkgs.runCommand "${image.name}-system-manager-vm-test.qcow2" { } '' pkgs.runCommand "${image.name}-system-manager-vm-test.qcow2" { } ''
# We will modify the VM image, so we need a mutable copy # We will modify the VM image, so we need a mutable copy
@ -333,7 +345,7 @@ in
# Copy the service files here, since otherwise they end up in the VM # Copy the service files here, since otherwise they end up in the VM
# with their paths including the nix hash # with their paths including the nix hash
cp ${self.lib.backdoor { inherit pkgs; }} backdoor.service cp ${self.lib.backdoor { inherit pkgs; }} backdoor.service
cp ${self.lib.mount_store { inherit pkgs; }} mount-store.service cp ${self.lib.mount_store { inherit pkgs pathsToRegister; }} mount-store.service
#export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 #export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1
${lib.concatStringsSep " \\\n" [ ${lib.concatStringsSep " \\\n" [