summaryrefslogtreecommitdiffstats
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:10:34 +0100
commitbe8dd82ce98da6caa0ba2ac0394ab68518a578cc (patch)
treef1eb63f8166ab6628e499753918a973b779482d9
parent51ad952626260f0dfd8e6beec837ca7d0d59b4f1 (diff)
downloadpoky-be8dd82ce98da6caa0ba2ac0394ab68518a578cc.tar.gz
Revert "initrd: Spawn an emergency shell when something goes wrong"
This had nowhere near enough testing... This reverts commit ffb6928f5783e5202d9849c3a185e29be1d41c63. (From OE-Core rev: f162f0ecc96fdfb564aad968e5b8bc670640ea68) 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 @@
2 2
3PATH=/sbin:/bin:/usr/sbin:/usr/bin 3PATH=/sbin:/bin:/usr/sbin:/usr/bin
4 4
5emergency_shell()
6{
7 echo "Bug in initramfs /init detected. Dropping to a shell. Good luck!"
8 echo
9 sh
10}
11trap "emergency_shell" 0 2
12
13# exit immediately if a command fails
14set -e
15
16ROOT_MOUNT="/rootfs/" 5ROOT_MOUNT="/rootfs/"
17ROOT_IMAGE="rootfs.img" 6ROOT_IMAGE="rootfs.img"
18MOUNT="/bin/mount" 7MOUNT="/bin/mount"