From ab41596a7ff31cb2ea607ecdd3cb3a0006ea4002 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 5 Jul 2008 00:16:39 +0000
Subject: [PATCH] Added option boot.extraGrubEntriesBeforeNixos=true/false to
 boot by default into nixos-default or into your extraGrubEntries

svn path=/nixos/trunk/; revision=12263
---
 etc/bashrc                     |  1 +
 installer/grub-menu-builder.sh | 21 ++++++++++++---------
 system/options.nix             |  7 +++++++
 system/system.nix              |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index 1027d96e0393..0b1cd5164282 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -11,6 +11,7 @@ fi
 # Some aliases.
 alias ls="ls --color=tty"
 alias ll="ls -l"
+alias l="ls -alh"
 alias which="type -p"
 
 # Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 7d0e241e5268..61a211283332 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -113,19 +113,22 @@ if test -n "@copyKernels@"; then
     mkdir -p /boot/kernels
 fi
 
+# Additional entries specified verbatim by the configuration.
+extraGrubEntries=$(cat >> $tmp <<EOF
+@extraGrubEntries@
+EOF)
 
-if test -n "$tmp"; then
-    addEntry "NixOS - Default" $default ""
+if test -n "@extraGrubEntriesBeforeNixos@"; then 
+  $extraGrubEntries
 fi
 
+if test -n "$tmp"; then
+   addEntry "NixOS - Default" $default ""
+fi
 
-# Additional entries specified verbatim by the configuration.
-cat >> $tmp <<EOF
-
-@extraGrubEntries@
-
-EOF
-
+if test -n "@extraGrubEntriesBeforeNixos@"; then 
+  $extraGrubEntries
+fi
 
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
diff --git a/system/options.nix b/system/options.nix
index 1a9ac26e4343..0bdbe3921354 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -275,6 +275,13 @@
       ";
     };
 
+    extraGrubEntriesBeforeNixos = mkOption {
+      default = false;
+      description = "
+	Wheter extraGrubEntries are put before the Nixos-default option
+      ";
+    };
+
     grubSplashImage = mkOption {
       default = pkgs.fetchurl {
         url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
diff --git a/system/system.nix b/system/system.nix
index 74bbf5d2b0e1..cc10120f1557 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -371,7 +371,7 @@ rec {
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot) copyKernels extraGrubEntries
+    inherit (config.boot) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
       grubSplashImage bootMount configurationLimit;
   };