From cdb98f8418aeb10171b6ab85277d435010a6343c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 18:58:04 +0000
Subject: [PATCH] * Option to disable the splash screen in the initrd.

svn path=/nixos/trunk/; revision=7755
---
 system/options.nix | 9 +++++++++
 system/system.nix  | 7 +++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 36c9084b8df..b20ebf9eeca 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -160,6 +160,15 @@
   }
 
 
+  {
+    name = ["boot" "initrd" "enableSplashScreen"];
+    default = true;
+    description = "
+      Whether to show a nice splash screen while booting.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
diff --git a/system/system.nix b/system/system.nix
index e5a30e0d07f..13ecce79c87 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -49,7 +49,6 @@ rec {
     { buildInputs = [pkgs.nukeReferences];
       inherit (pkgsStatic) utillinux;
       inherit (pkgsDiet) udev;
-      inherit (pkgs) splashutils;
       e2fsprogs = pkgs.e2fsprogsDiet;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
@@ -57,7 +56,6 @@ rec {
       ensureDir $out/bin
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
-      cp $splashutils/bin/splash_helper $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
     ";
@@ -93,7 +91,8 @@ rec {
       { object = bootStage1;
         symlink = "/init";
       }
-      { object = extraUtils;
+    ] ++ (if config.get ["boot" "initrd" "enableSplashScreen"] then [
+      { object = pkgs.splashutils;
         suffix = "/bin/splash_helper";
         symlink = "/sbin/splash_helper";
       }
@@ -103,7 +102,7 @@ rec {
         };
         symlink = "/etc/splash";
       }
-    ];
+    ] else []);
   };