init: switch back to tty1 after the installer finishes. (#576851)
This is a more general solution to what
2897993336dd05fe2f178481f896c4bbfecd6da5 was trying to do.
---
exception.py | 8 --------
loader/init.c | 4 +++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/exception.py b/exception.py
index abb8398..1408df6 100644
--- a/exception.py
+++ b/exception.py
@@ -89,14 +89,6 @@ class AnacondaExceptionHandler(ExceptionHandler):
pdb.post_mortem (tb)
os.kill(os.getpid(), signal.SIGKILL)
- def runQuit(self, (ty, value, tb)):
- # see a similar comment at runDebug()
- try:
- isys.vtActivate(1)
- except SystemError:
- pass
- sys.exit(self.exitcode)
-
def initExceptionHandling(anaconda):
conf = Config(programName="anaconda",
programVersion=isys.getAnacondaVersion(),
diff --git a/loader/init.c b/loader/init.c
index 1830aa8..175f1d7 100644
--- a/loader/init.c
+++ b/loader/init.c
@@ -857,8 +857,10 @@ int main(int argc, char **argv) {
pid_t childpid;
childpid = wait(&waitStatus);
- if (childpid == installpid)
+ if (childpid == installpid) {
doShutdown = 1;
+ ioctl(0, VT_ACTIVATE, 1);
+ }
}
if (!WIFEXITED(waitStatus) ||
--
1.6.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list