From 116eaef1485f337bb7c9434c51ce50671cfb3f78 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 26 May 1995 21:00:43 +0000
Subject: Put the console back on ttyv0 before rebooting.

---
 release/sysinstall/system.c  | 9 +++++++--
 usr.sbin/sade/system.c       | 9 +++++++--
 usr.sbin/sysinstall/system.c | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index b4ee445..a98d52f 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.36 1995/05/26 19:28:05 jkh Exp $
+ * $Id: system.c,v 1.37 1995/05/26 20:31:00 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -101,8 +101,13 @@ systemShutdown(void)
 	DialogActive = FALSE;
     }
     /* REALLY exit! */
-    if (getpid() == 1)
+    if (RunningAsInit) {
+	int on = 1;
+
+	/* Put the console back */
+	ioctl(0, TIOCCONS, &on);
 	reboot(RB_HALT);
+    }
     else
 	exit(1);
 }
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index b4ee445..a98d52f 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.36 1995/05/26 19:28:05 jkh Exp $
+ * $Id: system.c,v 1.37 1995/05/26 20:31:00 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -101,8 +101,13 @@ systemShutdown(void)
 	DialogActive = FALSE;
     }
     /* REALLY exit! */
-    if (getpid() == 1)
+    if (RunningAsInit) {
+	int on = 1;
+
+	/* Put the console back */
+	ioctl(0, TIOCCONS, &on);
 	reboot(RB_HALT);
+    }
     else
 	exit(1);
 }
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index b4ee445..a98d52f 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.36 1995/05/26 19:28:05 jkh Exp $
+ * $Id: system.c,v 1.37 1995/05/26 20:31:00 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -101,8 +101,13 @@ systemShutdown(void)
 	DialogActive = FALSE;
     }
     /* REALLY exit! */
-    if (getpid() == 1)
+    if (RunningAsInit) {
+	int on = 1;
+
+	/* Put the console back */
+	ioctl(0, TIOCCONS, &on);
 	reboot(RB_HALT);
+    }
     else
 	exit(1);
 }
-- 
cgit v1.1