File tree 1 file changed +29
-36
lines changed
1 file changed +29
-36
lines changed Original file line number Diff line number Diff line change 12
12
else
13
13
"/nix/store" ;
14
14
15
- in mkMerge [
16
- {
17
-
18
- boot . initrd . availableKernelModules = [ "squashfs" ] ;
19
-
20
- fileSystems = mkVMOverride {
21
- "${ storeMountPath } " = {
22
- device =
23
- lookupDriveDeviceName "nixstore" config . virtualisation . qemu . drives ;
24
- fsType = "squashfs" ;
25
- options = [ "ro" ] ;
26
- neededForBoot = true ;
27
- } ;
15
+ in {
16
+
17
+ boot . initrd . availableKernelModules = [ "squashfs" ] ;
18
+
19
+ fileSystems = mkVMOverride {
20
+ "${ storeMountPath } " = {
21
+ device =
22
+ lookupDriveDeviceName "nixstore" config . virtualisation . qemu . drives ;
23
+ fsType = "squashfs" ;
24
+ options = [ "ro" ] ;
25
+ neededForBoot = true ;
28
26
} ;
27
+ } ;
29
28
30
- system . build . squashfsStore =
31
- pkgs . callPackage ( modulesPath + "/../lib/make-squashfs.nix" ) {
32
- storeContents = config . virtualisation . additionalPaths ;
33
- } ;
29
+ system . build . squashfsStore =
30
+ pkgs . callPackage ( modulesPath + "/../lib/make-squashfs.nix" ) {
31
+ storeContents = config . virtualisation . additionalPaths ;
32
+ } ;
34
33
35
- virtualisation = {
34
+ virtualisation = {
36
35
37
- sharedDirectories = mkForce { } ;
36
+ sharedDirectories = mkForce { } ;
38
37
39
- qemu . drives = [ {
40
- name = "nixstore" ;
41
- file = "${ config . system . build . squashfsStore } " ;
42
- driveExtraOpts = {
43
- format = "raw" ;
44
- read-only = "on" ;
45
- werror = "report" ;
46
- } ;
47
- } ] ;
38
+ qemu . drives = [ {
39
+ name = "nixstore" ;
40
+ file = "${ config . system . build . squashfsStore } " ;
41
+ driveExtraOpts = {
42
+ format = "raw" ;
43
+ read-only = "on" ;
44
+ werror = "report" ;
45
+ } ;
46
+ } ] ;
48
47
49
- } ;
50
- }
51
- ( mkIf ( lib . version < "23.05" ) {
52
- # This should always have been the default.
53
- virtualisation . bootDevice =
54
- lookupDriveDeviceName "root" config . virtualisation . qemu . drives ;
55
- } )
56
- ]
48
+ } ;
49
+ }
You can’t perform that action at this time.
0 commit comments