From 01491abbfa31f70e290a468aeb4a2c3073df51f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Dec 2009 12:35:58 +0000
Subject: [PATCH] * Handle the case where initScriptBuilder is not set.

svn path=/nixos/trunk/; revision=19014
---
 modules/system/activation/switch-to-configuration.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 2a8e29bb841..207b17fd4ca 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -45,12 +45,14 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
       fi
       
     elif [ "@bootLoader@" = "generationsDir" ]; then
-          @menuBuilder@ @out@
+        @menuBuilder@ @out@
     else
-          echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
+        echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
 
-    @initScriptBuilder@ @out@
+    if [ -n "@initScriptBuilder@" ]; then
+        @initScriptBuilder@ @out@
+    fi
 fi
 
 # Activate the new configuration.