use "openvt" for emergency shell

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 92dd9671628ac568bdba5b1553fdd97b81a91246..45063c66a1bedd9c297aaba30f9c8cefec920f0b 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -7,4 +7,4 @@ omit_dracutmodules+=" dash "
 stdloglvl=3
 prefix=/run/initramfs
 realinitpath="/usr/lib/systemd/systemd"
-install_items+=" vi /etc/virc ps grep cat rm "
+install_items+=" vi /etc/virc ps grep cat rm openvt "

diff --git a/modules.d/99base/init b/modules.d/99base/init
index f8d52f70d811428e65d88dd59626bc16ec7a64e9..9e189da03788b06b9fc4fbc34307f042f7030d35 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -64,6 +64,8 @@ emergency_shell()
             _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
             [ -c "$_ctty" ] || _ctty=/dev/tty1
             setsid sh -i -l 0<$_ctty 1>$_ctty 2>&1
+        elif [ -n "$(command -v openvt)" ] && ! getarg "console=" >/dev/null 2>&1 && getargbool 1 "rd.openvt" ; then
+            openvt -f -c 1 -w -s -l -- sh
         else
             sh -i -l 0<$_ctty 1>$_ctty 2>&1
         fi

diff --git a/modules.d/99shutdown/shutdown b/modules.d/99shutdown/shutdown
index 019a451a9413032236941aed73a2e2b4595250dc..64937fa7083ce7d5b79a304d016be81f915dd916 100755 (executable)
--- a/modules.d/99shutdown/shutdown
+++ b/modules.d/99shutdown/shutdown
@@ -36,6 +36,8 @@ emergency_shell()
             _ctty="$(getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
             [ -c "$_ctty" ] || _ctty=/dev/tty1
             setsid sh -i -l 0<$_ctty 1>$_ctty 2>&1
+        elif [ -n "$(command -v openvt)" ] && ! getarg "console=" >/dev/null 2>&1 && getargbool 1 "rd.openvt" ; then
+            openvt -f -c 1 -w -s -l -- sh
         else
             sh -i -l 0<$_ctty 1>$_ctty 2>&1
         fi