From 4225181fa11c49bf0cf732f6539840a778b06d1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2010 09:28:22 +0000
Subject: [PATCH] =?UTF-8?q?*=20Ensure=20that=20the=20=E2=80=98mount-failed?=
 =?UTF-8?q?=E2=80=99=20and=20=E2=80=98emergency-shell=E2=80=99=20tasks=20d?=
 =?UTF-8?q?on't=20get=20=20=20started=20by=20=E2=80=98switch-to-configurat?=
 =?UTF-8?q?ion.sh=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/branches/boot-order/; revision=22473
---
 modules/tasks/filesystems.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index fe231d94ec82..7d53824d050d 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -177,6 +177,7 @@ in
         startOn = "mount-failed";
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
             start --no-wait emergency-shell \
               DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
           '';
@@ -191,6 +192,8 @@ in
 
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
+            
             exec < /dev/console > /dev/console 2>&1
 
             cat <<EOF