summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-02 16:56:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:08:47 +0100
commitf162f0ecc96fdfb564aad968e5b8bc670640ea68 (patch)
treee4d7efccfba7adcd69a6e817b3c6de15619204c0
parentf89bced26de055817100d0b0e03094b031fcfd48 (diff)
downloadopenembedded-core-f162f0ecc96fdfb564aad968e5b8bc670640ea68.tar.gz
openembedded-core-f162f0ecc96fdfb564aad968e5b8bc670640ea68.tar.bz2
openembedded-core-f162f0ecc96fdfb564aad968e5b8bc670640ea68.zip
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>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh11
1 files changed, 0 insertions, 11 deletions
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"