From 8748f7c0d4b955f5d102a1bd33b5a5e025b22779 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <yves.dubromelle@partnre.com>
Date: Tue, 11 Apr 2017 10:17:56 +0200
Subject: [PATCH] =?UTF-8?q?la=20g=C3=A9n=C3=A9ration=20de=20configuration?=
 =?UTF-8?q?=20se=20fait=20avec=20un=20script=20au=20lieu=20d'un=20Makefile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile.installation |  7 -------
 generate-config.sh    | 14 ++++++++++++++
 livecd-minimal.nix    | 10 ++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 Makefile.installation
 create mode 100644 generate-config.sh

diff --git a/Makefile.installation b/Makefile.installation
deleted file mode 100644
index 6d6f4e7..0000000
--- a/Makefile.installation
+++ /dev/null
@@ -1,7 +0,0 @@
-all:
-	nixos-generate-config --root /mnt
-	git config --global user.email "nixos-live@example.org"
-	git config --global user.name "NixOS Live"
-	cd /mnt/etc/nixos && git init . && git add . && git commit -m "initial commit"
-	cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-base.git base
-	cd /mnt/etc/nixos && git submodule add https://gogs.prunetwork.fr/Capgemini-CDS-Arkea/template-nixos.git capgemini-cmb
diff --git a/generate-config.sh b/generate-config.sh
new file mode 100644
index 0000000..d39d83f
--- /dev/null
+++ b/generate-config.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Génération de la configuration par l'outil NixOS
+nixos-generate-config --root /mnt
+# Configuration de Git
+git config --global user.email "nixos-live@example.org"
+git config --global user.name "NixOS Live"
+# Initialisation du dépôt de la machine et ajout des templates de configuration
+cd /mnt/etc/nixos
+git init .
+git add .
+git commit -m "initial commit"
+git submodule add https://gogs.prunetwork.fr/nixos-config/nixos-template-base.git base
+git submodule add https://gogs.prunetwork.fr/Capgemini-CDS-Arkea/template-nixos.git capgemini-cmb
diff --git a/livecd-minimal.nix b/livecd-minimal.nix
index b5bf770..675f5df 100644
--- a/livecd-minimal.nix
+++ b/livecd-minimal.nix
@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
-
+let
+  custom-generator = "generate-config.sh";
+in
 {
   imports = [
     capgemini-cmb/default.nix
@@ -14,10 +16,10 @@
   # Files to copy to the liveCD
   isoImage.contents = [
     {
-      source = ./Makefile.installation;
-      target = "/custom/Makefile";
+      source = "./${custom-generator}";
+      target = "/custom/${custom-generator}";
     }
   ];
-  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
+  environment.shellAliases = { nixos-generate-custom-config = "/iso/custom/${custom-generator}";};
   networking.hostName = "nixos-livecd.corp.capgemini.com";
 }