From 8a9b42b64d2760a7c8a167d8cba632fd4ae05db0 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sat, 17 Oct 2009 09:54:41 -0400
Subject: [PATCH] Don't terminate on failure when we get to point of fsck.

fsck will return non-zero for things that aren't fatal.
---
 misc/merge.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/merge.sh b/misc/merge.sh
index c88e090..1093409 100755
--- a/misc/merge.sh
+++ b/misc/merge.sh
@@ -99,6 +99,7 @@ umount /x86
 umount /x86_64
 
 # We disable fsck intervals...this is a demo, after all!
+set +e
 time fsck.ext3 -D -C 0 -f /dev/sda1
 tune2fs -c 0 /dev/sda1
 tune2fs -i 0 /dev/sda1