From 2fcd1195e650d59b05607f2851c9f100d2f02931 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 23 Apr 2013 03:06:59 +0200
Subject: [PATCH] bash: change shell script option types from string to lines
 installation-cd-base: export mountPoint=/mnt. This doesn't change the default
 behavior, but an explicit mount point specification is cleaner.

---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 ++
 modules/programs/bash/bash.nix                    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 5c67c8e2a9d7..edcbed6e0b93 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -32,4 +32,6 @@ with pkgs.lib;
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
+
+  environment.shellInit = "export mountPoint=/mnt";
 }
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index a4b71cfc2769..a41a588a4747 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -46,7 +46,7 @@ let
       description = ''
         Shell script code used to initialise the shell prompt.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.shellInit = mkOption {
@@ -55,7 +55,7 @@ let
       description = ''
         Shell script code called during login shell initialisation.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.interactiveShellInit = mkOption {
@@ -64,7 +64,7 @@ let
       description = ''
         Shell script code called during interactive shell initialisation.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.enableBashCompletion = mkOption {