From: Ross Burton <ross.burton@intel.com>
Date: Tue, 2 Oct 2012 15:56:05 +0000 (+0100)
Subject: Revert "initrd: Spawn an emergency shell when something goes wrong"
X-Git-Tag: 2015-4~8975
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f162f0ecc96fdfb564aad968e5b8bc670640ea68;p=openembedded-core.git

Revert "initrd: Spawn an emergency shell when something goes wrong"

This had nowhere near enough testing...

This reverts commit ffb6928f5783e5202d9849c3a185e29be1d41c63.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 2639308c28..5682fd18c1 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -2,17 +2,6 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-emergency_shell()
-{
-    echo "Bug in initramfs /init detected. Dropping to a shell. Good luck!"
-    echo
-    sh
-}
-trap "emergency_shell" 0 2
-
-# exit immediately if a command fails
-set -e
-
 ROOT_MOUNT="/rootfs/"
 ROOT_IMAGE="rootfs.img"
 MOUNT="/bin/mount"