From 23c2e9f4947a2d9be6b63f55cca8e633df3455a3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 5 Jun 2012 15:33:35 +0200
Subject: [PATCH] Adding commented 'set -e' explicitly in all subscripts to
 avoid running it with 'set -e' until we've made sure it's properly working.

---
 initramfs-tools/scripts/live | 2 ++
 scripts/boot/arguments.sh    | 2 ++
 scripts/boot/misc-helpers.sh | 2 ++
 scripts/boot/mount-cifs.sh   | 2 ++
 scripts/boot/mount-http.sh   | 2 ++
 scripts/boot/mount-iscsi.sh  | 2 ++
 scripts/boot/mount-nfs.sh    | 2 ++
 scripts/boot/netboot.sh      | 2 ++
 scripts/boot/networking.sh   | 2 ++
 scripts/boot/overlay.sh      | 2 ++
 scripts/boot/snapshot.sh     | 2 ++
 scripts/boot/toram-todisk.sh | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/initramfs-tools/scripts/live b/initramfs-tools/scripts/live
index 465d1da..ad67e24 100755
--- a/initramfs-tools/scripts/live
+++ b/initramfs-tools/scripts/live
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 if [ -e /lib/live/boot.sh ]
 then
 	/lib/live/boot.sh ${@}
diff --git a/scripts/boot/arguments.sh b/scripts/boot/arguments.sh
index 07c9d9a..6b4e553 100755
--- a/scripts/boot/arguments.sh
+++ b/scripts/boot/arguments.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 Arguments ()
 {
 	PRESEEDS=""
diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/misc-helpers.sh
index 202ebe6..fe45ee1 100755
--- a/scripts/boot/misc-helpers.sh
+++ b/scripts/boot/misc-helpers.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 is_in_list_separator_helper () {
 	local sep=${1}
 	shift
diff --git a/scripts/boot/mount-cifs.sh b/scripts/boot/mount-cifs.sh
index 24fef88..a8ef3f4 100755
--- a/scripts/boot/mount-cifs.sh
+++ b/scripts/boot/mount-cifs.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_cifsmount ()
 {
 	rc=1
diff --git a/scripts/boot/mount-http.sh b/scripts/boot/mount-http.sh
index 99851b9..1b718c0 100755
--- a/scripts/boot/mount-http.sh
+++ b/scripts/boot/mount-http.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_httpmount ()
 {
 	rc=1
diff --git a/scripts/boot/mount-iscsi.sh b/scripts/boot/mount-iscsi.sh
index e9cd9cf..35e2b46 100755
--- a/scripts/boot/mount-iscsi.sh
+++ b/scripts/boot/mount-iscsi.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_iscsi()
 {
 	do_netsetup
diff --git a/scripts/boot/mount-nfs.sh b/scripts/boot/mount-nfs.sh
index 797bfa5..6a3ae55 100755
--- a/scripts/boot/mount-nfs.sh
+++ b/scripts/boot/mount-nfs.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_nfsmount ()
 {
 	rc=1
diff --git a/scripts/boot/netboot.sh b/scripts/boot/netboot.sh
index 763a258..5054fb8 100755
--- a/scripts/boot/netboot.sh
+++ b/scripts/boot/netboot.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_netmount()
 {
 	do_netsetup
diff --git a/scripts/boot/networking.sh b/scripts/boot/networking.sh
index 268770e..3d22a90 100755
--- a/scripts/boot/networking.sh
+++ b/scripts/boot/networking.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_netsetup ()
 {
 	modprobe -q af_packet # For DHCP
diff --git a/scripts/boot/overlay.sh b/scripts/boot/overlay.sh
index 193c510..17a47e1 100755
--- a/scripts/boot/overlay.sh
+++ b/scripts/boot/overlay.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 setup_unionfs ()
 {
 	image_directory="${1}"
diff --git a/scripts/boot/snapshot.sh b/scripts/boot/snapshot.sh
index 3c9ebcd..568fda7 100755
--- a/scripts/boot/snapshot.sh
+++ b/scripts/boot/snapshot.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 do_snap_copy ()
 {
 	fromdev="${1}"
diff --git a/scripts/boot/toram-todisk.sh b/scripts/boot/toram-todisk.sh
index 6164dee..2643eb8 100755
--- a/scripts/boot/toram-todisk.sh
+++ b/scripts/boot/toram-todisk.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#set -e
+
 copy_live_to ()
 {
 	copyfrom="${1}"
-- 
2.1.4