From 5ab596451a0d4eb56f96083fc3e3c204401132e0 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Thu, 7 Feb 2019 17:22:49 -0500 Subject: mksh: add mkshrc when using TW_USE_TOOLBOX Fixes broken shell prompt in Terminal and adb shell Before: https://del.dog/7vphlkc After: https://del.dog/vhkjgo8 Add as prebuilt with suffix "_twrp" to avoid conflict with original mkshrc and rename via POST_INSTALL_CMD Prebuilt version adjusts TMPDIR variable from "/data/local/tmp" to "/tmp" for TWRP Change-Id: I42a1b2a8c114f66dbe659c07485f1dfae8a5d314 --- etc/Android.mk | 15 +++++++++++++++ etc/init.rc | 1 + etc/init.recovery.mksh.rc | 2 ++ 3 files changed, 18 insertions(+) create mode 100755 etc/init.recovery.mksh.rc (limited to 'etc') diff --git a/etc/Android.mk b/etc/Android.mk index cda0f372e..4aeb251dc 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -88,3 +88,18 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true) include $(BUILD_PREBUILT) endif endif + +ifeq ($(TW_USE_TOOLBOX), true) + include $(CLEAR_VARS) + LOCAL_MODULE := init.recovery.mksh.rc + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + + # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc + # during ramdisk creation and only allows init.recovery.*.rc files to be copied + # from TARGET_ROOT_OUT thereafter + LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + + LOCAL_SRC_FILES := $(LOCAL_MODULE) + include $(BUILD_PREBUILT) +endif diff --git a/etc/init.rc b/etc/init.rc index bcd519b03..348471d4f 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -1,4 +1,5 @@ import /init.recovery.logd.rc +import /init.recovery.mksh.rc import /init.recovery.usb.rc import /init.recovery.service.rc import /init.recovery.vold_decrypt.rc diff --git a/etc/init.recovery.mksh.rc b/etc/init.recovery.mksh.rc new file mode 100755 index 000000000..3afd946f3 --- /dev/null +++ b/etc/init.recovery.mksh.rc @@ -0,0 +1,2 @@ +on init + export ENV /etc/mkshrc -- cgit v1.2.3