Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
# This module defines a systemd service that automatically installs NixOS to the disk.
|
||||
# It is intended to be used in an installation ISO.
|
||||
# It expects `targetSystem` (the closure to install) and `diskoScript` (the partitioning script) to be passed as arguments.
|
||||
# It expects `targetSystem` (the closure to install), `diskoScript` (the partitioning script),
|
||||
# and `closureExport` (the pre-built NAR archive) to be passed as arguments.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
@@ -10,6 +11,7 @@
|
||||
hostPlatform,
|
||||
targetSystemBuild,
|
||||
diskoScript,
|
||||
closureExport,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -21,8 +23,12 @@
|
||||
targetSystemBuild.toplevel
|
||||
];
|
||||
|
||||
# Explicitly include the system closure in the ISO image to prevent any need to build or fetch
|
||||
# Explicitly include the pre-built closure export and system in the ISO image
|
||||
isoImage.contents = [
|
||||
{
|
||||
source = closureExport;
|
||||
target = "/closure-export";
|
||||
}
|
||||
{
|
||||
source = targetSystem;
|
||||
target = "/system";
|
||||
|
||||
Reference in New Issue
Block a user