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

login
register
mail settings
Submitter Ross Burton
Date Oct. 2, 2012, 3:56 p.m.
Message ID <1349193366-6632-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/37623/
State Accepted
Commit f162f0ecc96fdfb564aad968e5b8bc670640ea68
Headers show

Comments

Ross Burton - Oct. 2, 2012, 3:56 p.m.
This had nowhere near enough testing...

This reverts commit ffb6928f5783e5202d9849c3a185e29be1d41c63.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/initrdscripts/files/init-live.sh |   11 -----------
 1 file changed, 11 deletions(-)
Saul Wold - Oct. 3, 2012, 1:46 a.m.
On 10/02/2012 08:56 AM, Ross Burton wrote:
> This had nowhere near enough testing...
>
> This reverts commit ffb6928f5783e5202d9849c3a185e29be1d41c63.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-core/initrdscripts/files/init-live.sh |   11 -----------
>   1 file changed, 11 deletions(-)
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
> index 2639308..5682fd1 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"
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 2639308..5682fd1 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"