From 4716ccf1b1545cc60e63fd27b1c8d87be1bad915 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 13:40:03 +0000
Subject: [PATCH] nixosBootStub: Hide noisy efibootmgr output

svn path=/nixos/trunk/; revision=33157
---
 modules/installer/efi-boot-stub/efi-boot-stub-builder.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index 2e778210dc5..d736fb417a6 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -65,7 +65,7 @@ addEntry() {
     if test -n "@runEfibootmgr@"; then
       set +e
       efibootmgr -c -d "@efiDisk@" -g -l $(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') -L "NixOS $generation Generation" -p "@efiPartition@" \
-        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)
+        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params) > /dev/null 2>&1
       set -e
     fi
 
@@ -97,9 +97,9 @@ if test -n "@runEfibootmgr@"; then
   set +e
   modprobe efivars
   for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed 's/Boot//' | sed 's/\*.*//'); do
-    efibootmgr -B -b "$bootnum"
-    set -e
+    efibootmgr -B -b "$bootnum" > /dev/null 2>&1
   done
+  set -e
 fi
 
 # Add all generations of the system profile to the system partition, in reverse
@@ -114,7 +114,7 @@ done
 
 if test -n "@runEfibootmgr@"; then
   set +e
-  efibootmgr -o $defaultbootnum
+  efibootmgr -o $defaultbootnum > /dev/null 2>&1
   set -e
 fi