From 442093d27dfd1822b42066e069a7465dccae5118 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2010 09:56:53 +0000
Subject: [PATCH] * grep returns a non-zero exit code if no line matches,
 causing the   swap task to fail.  So ignore that.

svn path=/nixos/trunk/; revision=19660
---
 modules/tasks/swap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index 333cf674c077..ab81185532ea 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -94,7 +94,7 @@ in
               device=$(readlink -f "$device")
               # Add new swap devices.
               if echo $unused | grep -q "^$device\$"; then
-                unused="$(echo $unused | grep -v "^$device\$")"
+                unused="$(echo $unused | grep -v "^$device\$" || true)"
               else
                 ${utillinux}/sbin/swapon "$device" || true
               fi