From 07d8924ecd7dc8394f67998d81e904b50848ddb2 Mon Sep 17 00:00:00 2001
From: System administrator <root@lfr001436.corp.capgemini.com>
Date: Tue, 11 Apr 2017 13:44:14 +0200
Subject: [PATCH] =?UTF-8?q?gparted:=20coquille,=20=C3=A9tait=20"parted"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                            |  3 +++
 applications/graphical/adminsys.nix |  2 +-
 iso-image/Makefile.installation     |  7 +++++++
 iso-image/configuration.nix         | 23 +++++++++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 iso-image/Makefile.installation
 create mode 100644 iso-image/configuration.nix

diff --git a/Makefile b/Makefile
index 2ec6926..4c13a2a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,9 @@ download-sources:
 	# https://nixos.org/wiki/Download_all_sources
 	nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))
 
+build-iso:
+	nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=/etc/nixos/base/iso-image/livecd-minimal.nix
+
 ##--------- Commandes spécifiques pour GIT
 
 push: submodules-push
diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix
index 7e5c66a..6dd53b3 100644
--- a/applications/graphical/adminsys.nix
+++ b/applications/graphical/adminsys.nix
@@ -12,7 +12,7 @@ mkIf cfg.graphical {
   # Paquets
   environment.systemPackages = with pkgs; [
      # Gestion de FS
-     parted       # Gestion graphique de partitions
+     gparted       # Gestion graphique de partitions
      unetbootin    # création de clefs USB bootables
   ];
 }
diff --git a/iso-image/Makefile.installation b/iso-image/Makefile.installation
new file mode 100644
index 0000000..6d6f4e7
--- /dev/null
+++ b/iso-image/Makefile.installation
@@ -0,0 +1,7 @@
+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/iso-image/configuration.nix b/iso-image/configuration.nix
new file mode 100644
index 0000000..b5bf770
--- /dev/null
+++ b/iso-image/configuration.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    capgemini-cmb/default.nix
+    /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+    nixos-template-base/base.nix
+  ];
+  # Custom name
+  isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-capgemini-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
+  # Avoid having the terminal flooded by kernel audit messages
+  boot.kernelParams = [ "audit=0" ];
+
+  # Files to copy to the liveCD
+  isoImage.contents = [
+    {
+      source = ./Makefile.installation;
+      target = "/custom/Makefile";
+    }
+  ];
+  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
+  networking.hostName = "nixos-livecd.corp.capgemini.com";
+}