commit 99c379cc0aece6fb451800d4d031e2c461feb623
author Josh Gao <jmgao@google.com> Thu Mar 29 20:34:08 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 29 20:34:08 2018 +0000
tree 52a19902b96ccca6b4e0ce1d4f30c139c66d9bd2
parent 7b388008f5c46dc53a4a5b77e960cb584ccee0c7
parent 827d6b8caff5c6c06fa3688ebce010df747b67b9

Merge "mkshrc: set +o nohup."
am: 827d6b8caf

Change-Id: Ib9ceff3b3561ae01c22f07e7e89335048eba9937

mkshrc

diff --git a/mkshrc b/mkshrc
index 778cf09..d37de12 100644
--- a/mkshrc
+++ b/mkshrc
@@ -6,6 +6,8 @@
 #
 # Support: https://launchpad.net/mksh
 
+set +o nohup
+
 if (( USER_ID )); then PS1='$'; else PS1='#'; fi
 PS4='[$EPOCHREALTIME] '; PS1='${|
 	local e=$?

mkshrc_vendor

diff --git a/mkshrc_vendor b/mkshrc_vendor
index 778cf09..d37de12 100644
--- a/mkshrc_vendor
+++ b/mkshrc_vendor
@@ -6,6 +6,8 @@
 #
 # Support: https://launchpad.net/mksh
 
+set +o nohup
+
 if (( USER_ID )); then PS1='$'; else PS1='#'; fi
 PS4='[$EPOCHREALTIME] '; PS1='${|
 	local e=$?