Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP]: initrd: Use systemd #120015

Closed
wants to merge 9 commits into from
Closed

[WIP]: initrd: Use systemd #120015

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6987073
Add vmConfig to nixos/default.nix
ElvishJerricco Apr 18, 2021
d3e6e2a
initrd: Rewrite to use systemd
ElvishJerricco Apr 18, 2021
5c50976
systemd: Use systemd-makefs and growfs
ElvishJerricco Apr 18, 2021
dc756fe
qemu-vm: Support systemd initrd
ElvishJerricco Apr 18, 2021
cad9847
initrd: Support luks with systemd and /etc/crypttab
ElvishJerricco Apr 18, 2021
1404a51
initrd: Only load the minimum in modules-load.d
ElvishJerricco Apr 22, 2021
7fd29f6
systemd-initrd: Use a Rust script for dependency solving
ElvishJerricco Jul 9, 2021
c604154
systemd-initrd: Cleanup some systemd units
ElvishJerricco Jul 9, 2021
78d09d5
systemd-initrd: Remove defunct make-initrd.nix and find-libs.nix
ElvishJerricco Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions nixos/modules/virtualisation/qemu-vm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,15 +672,32 @@ in
# configuration, where the regular value for the `fileSystems'
# attribute should be disregarded for the purpose of building a VM
# test image (since those filesystems don't exist in the VM).
fileSystems = mkVMOverride (
fileSystems = let
roStore = {
device = "store";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}";
neededForBoot = true;
};
in mkVMOverride (
cfg.fileSystems //
{ "/".device = cfg.bootDevice;
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}";
neededForBoot = true;
{ "/" =
{ device = cfg.bootDevice;
autoFormat = true;
fsType = "ext4";
};
"/nix/store" = if !cfg.writableStore then roStore else {
device = "overlay";
fsType = "overlay";
options = [
"lowerdir=/sysroot/nix/.ro-store"
"upperdir=/sysroot/nix/.rw-store/store"
"workdir=/sysroot/nix/.rw-store/work"
"x-systemd.wants=rw-store.service"
"x-systemd.after=rw-store.service"
];
};
"/nix/.ro-store" = mkIf cfg.writableStore roStore;
"/tmp" = mkIf config.boot.tmpOnTmpfs
{ device = "tmpfs";
fsType = "tmpfs";
Expand Down Expand Up @@ -714,6 +731,16 @@ in
noCheck = true; # fsck fails on a r/o filesystem
};
});
boot.initrd.extraUnits."rw-store.service" = lib.mkIf cfg.writableStore (pkgs.writeText "rw-store.service" ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we use our regular systemd unit generation for this? It is a trivial unit yet doesn't allow any composition (without adding a unit named rw-store.service.d/overrides.conf or such?).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about this, but I wasn't 100% sure if that would be too much. I'll look into it...

[Unit]
Before=sysroot-nix-store.mount
RequiresMountsFor=/sysroot/nix/.rw-store /sysroot/nix/.ro-store
DefaultDependencies=no
[Service]
ExecStart=${pkgs.coreutils}/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/.ro-store /sysroot/nix/store
Type=oneshot
RemainAfterExit=yes
'');

swapDevices = mkVMOverride [ ];
boot.initrd.luks.devices = mkVMOverride {};
Expand Down