From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 28A565FEBB; Thu, 15 Sep 2022 07:35:24 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 5D1C05FEAF; Thu, 15 Sep 2022 07:35:22 +0000 (UTC) Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by atuin.qyliss.net (Postfix) with ESMTPS id 547175FE7F for ; Thu, 15 Sep 2022 07:35:20 +0000 (UTC) Received: by mail-lf1-x12d.google.com with SMTP id i26so28952978lfp.11 for ; Thu, 15 Sep 2022 00:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=wPYRvS8SaVTiVk+vQLfekUPVCRW9vopXEFN7thPfBqo=; b=Jnb4eetPJxfgfsnCWmQGcJtgHbrk2nn0f9JaqqdWYGEX93UJ5xrbu0P0+w0cpizEZt SZY/CzBw8GP2xtu1NQ7ayEvi3vSchm7S4iREy4nX24/NgDxjqVL10BdLZe6AD0bnN2z8 0svDFV02ywgI1RZrSRmioKQlbOvF7JdMM5FrMxYwJX1cfjf0d7HohVr1XbtnNIIVVKfh FslEx33jijKSrb0A4nXo8wWiNrukgxXo3T2OAtPVpqt7+IQ3Ta9TJ+RQgFL6SnxZ8oWR M4OomdBVLf6p00RqgyiT5rwqGAlkkZAd8RyjDw5ql4TI+PuydisyImObzBXlACgt3DSM 3qEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=wPYRvS8SaVTiVk+vQLfekUPVCRW9vopXEFN7thPfBqo=; b=PYLM4xG9BRhbQqNONB3qeJsy66taiBmFPVdUa+T68APidn+h5ULGu+QAydyAaDBy2s hk1ucg+8f8WCZ38i9VGGD3HlzyKAfJ4KxwyirSykoaFjXxcjBKYa5LIHCszdPU2E/MCl 6YsZwB8VZLeuXPcj8jmUVqUuJE8nOjDvo/7KPJKtSqPHs4dvfd+WvbaV3q/3Foirmm5E ofhWut/ZudqohF2+7POixUQbW52rTGdDs0eUg8gnsszBEDMq59HmPZdJ1DQdXml6na5e 1Pebf43+dMp24LtPQABC4bMD/HWUwWOmws6S0NCSPjw6N6s4WfAOzb9XubUsWCwGbvT2 8npg== X-Gm-Message-State: ACgBeo0gZTdaw60VTd8KrqL/AoPaTKfUrUwy51AdjiI/2BRSDE4p3J3I qoH1716haAWOcJ4KQlBUPVNHUok07hKwezV83yU= X-Google-Smtp-Source: AA6agR5yhvEzSZ/6FS8qoqPFH6GChUNytowKMzVWu9uSJYjMSwJIZmPng32LwO7xYEpen4UEVHFX3A== X-Received: by 2002:a05:6512:1095:b0:49d:1241:a314 with SMTP id j21-20020a056512109500b0049d1241a314mr2979930lfg.595.1663227316926; Thu, 15 Sep 2022 00:35:16 -0700 (PDT) Received: from Unikie-T14-Gen-2i.madriguera.foxhound.fi (91-157-106-8.elisa-laajakaista.fi. [91.157.106.8]) by smtp.googlemail.com with ESMTPSA id bn5-20020a05651c178500b0026c18aa8587sm1615719ljb.75.2022.09.15.00.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 00:35:16 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= To: devel@spectrum-os.org Subject: [PATCH] Add image configuration option Date: Thu, 15 Sep 2022 10:35:15 +0300 Message-Id: <20220915073515.47855-1-jose.pekkarinen@unikie.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: YSRER5QH47DHC6BGLLMQ4VV3JANT457P X-Message-ID-Hash: YSRER5QH47DHC6BGLLMQ4VV3JANT457P X-MailFrom: jose.pekkarinen@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The following patch proposes to host nix configuration files under nix folder that offers default configuration for an image, defaulting to a release image, which would be plain spectrum. A hardened default configuration will be proposed in the near future. In case of configuration collision between the default configuration and config.nix, the latter will be taken into account. Signed-off-by: José Pekkarinen --- nix/eval-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/eval-config.nix b/nix/eval-config.nix index 467f877..09a7ada 100644 --- a/nix/eval-config.nix +++ b/nix/eval-config.nix @@ -10,4 +10,5 @@ ({ pkgs ? import {} }: { inherit pkgs; -}) config +}) (if config ? image && builtins.pathExists ./${config.image}.nix then + import ./${config.image}.nix else {}) // config -- 2.25.1