From: Dave Young <dyoung@redhat.com>
Date: Wed, 1 Aug 2012 10:07:52 +0000 (+0800)
Subject: split emergency_shell function
X-Git-Tag: 023~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=126732bcc1f5425c14923db59487eabb448ab846;p=platform%2Fupstream%2Fdracut.git

split emergency_shell function

Kdump dracut hooks need to enter emergency shell, currently it directly call
"sh -i -l", with recent dracut this does not work anymore without proper ctty.

It will be convinient to seperate a standalone function _emergency_shell for
dracut modules to call.
---

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 7ea5c54..a4a36e4 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -864,6 +864,37 @@ wait_for_loginit()
     rm -f /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
 }
 
+_emergency_shell()
+{
+    local _name="$1"
+    if [ -x /lib/systemd/systemd ]; then
+        > /.console_lock
+        echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile
+        systemctl start emergency.service
+        debug_off
+        while [ -e /.console_lock ]; do sleep 1; done
+        debug_on
+    else
+        echo "Dropping to debug shell."
+        echo
+        export PS1="$_name:\${PWD}# "
+        [ -e /.profile ] || >/.profile
+
+        _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
+        if [ -z "$_ctty" ]; then
+            _ctty=console
+            while [ -f /sys/class/tty/$_ctty/active ]; do
+                _ctty=$(cat /sys/class/tty/$_ctty/active)
+                _ctty=${_ctty##* } # last one in the list
+            done
+            _ctty=/dev/$_ctty
+        fi
+        [ -c "$_ctty" ] || _ctty=/dev/tty1
+        strstr "$(setsid --help 2>/dev/null)" "ctty" && CTTY="-c"
+        setsid $CTTY /bin/sh -i -l 0<$_ctty 1>$_ctty 2>&1
+    fi
+}
+
 emergency_shell()
 {
     local _ctty
@@ -883,32 +914,7 @@ emergency_shell()
     echo
 
     if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then
-        if [ -x /lib/systemd/systemd ]; then
-            > /.console_lock
-            echo "PS1=\"$_rdshell_name:\${PWD}# \"" >/etc/profile
-            systemctl start emergency.service
-            debug_off
-            while [ -e /.console_lock ]; do sleep 1; done
-            debug_on
-        else
-            echo "Dropping to debug shell."
-            echo
-            export PS1="$_rdshell_name:\${PWD}# "
-            [ -e /.profile ] || >/.profile
-
-            _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
-            if [ -z "$_ctty" ]; then
-                _ctty=console
-                while [ -f /sys/class/tty/$_ctty/active ]; do
-                    _ctty=$(cat /sys/class/tty/$_ctty/active)
-                    _ctty=${_ctty##* } # last one in the list
-                done
-                _ctty=/dev/$_ctty
-            fi
-            [ -c "$_ctty" ] || _ctty=/dev/tty1
-            strstr "$(setsid --help 2>/dev/null)" "ctty" && CTTY="-c"
-            setsid $CTTY /bin/sh -i -l 0<$_ctty 1>$_ctty 2>&1
-        fi
+        _emergency_shell $_rdshell_name
     else
         warn "$action has failed. To debug this issue add \"rd.shell\" to the kernel command line."
         # cause a kernel panic