From b1d98a6218c5c4c7fd7dc1966e977c53da841f82 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Mon, 26 Jun 2023 02:00:21 +0000 Subject: Make system config included in the tarball writeable --- modules/build-tarball.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/build-tarball.nix b/modules/build-tarball.nix index 9aff779..d2e5231 100644 --- a/modules/build-tarball.nix +++ b/modules/build-tarball.nix @@ -51,17 +51,20 @@ let # Write wsl.conf so that it is present when NixOS is started for the first time cp ${config.environment.etc."wsl.conf".source} ./etc/wsl.conf - '' + lib.optionalString cfg.includeConfig (if cfg.configPath == null then '' - # Copy the system configuration - mkdir -p ./etc/nixos/nixos-wsl - cp -R ${lib.cleanSource ../.}/. ./etc/nixos/nixos-wsl - mv ./etc/nixos/nixos-wsl/configuration.nix ./etc/nixos/configuration.nix - # Patch the import path to avoid having a flake.nix in /etc/nixos - sed -i 's|import \./default\.nix|import \./nixos-wsl|' ./etc/nixos/configuration.nix - '' else '' - mkdir -p ./etc/nixos - cp -R ${lib.cleanSource cfg.configPath}/. ./etc/nixos - '')); + '' + lib.optionalString cfg.includeConfig '' + ${if cfg.configPath == null then '' + # Copy the system configuration + mkdir -p ./etc/nixos/nixos-wsl + cp -R ${lib.cleanSource ../.}/. ./etc/nixos/nixos-wsl + mv ./etc/nixos/nixos-wsl/configuration.nix ./etc/nixos/configuration.nix + # Patch the import path to avoid having a flake.nix in /etc/nixos + sed -i 's|import \./default\.nix|import \./nixos-wsl|' ./etc/nixos/configuration.nix + '' else '' + mkdir -p ./etc/nixos + cp -R ${lib.cleanSource cfg.configPath}/. ./etc/nixos + ''} + chmod -R u+w etc/nixos + ''); in { -- cgit v1.2.3