Oh crud, did I ever screw the pooch! Rather than sync this with -stable,

I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE!  I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago.  I think sleep deprivation gets the blame
for this one.

Medal for noticing this one goes to:	Jim Bloom <bloom@acm.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index d46ff5d09c9e..fc57fe33dc1b 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -71,7 +71,9 @@ expand(char *fname)
 void
 systemInitialize(int argc, char **argv)
 {
+#ifdef __alpha__
     int i;
+#endif
 
     signal(SIGINT, SIG_IGN);
     globalsInit();
@@ -109,11 +111,15 @@ systemInitialize(int argc, char **argv)
 	close(1); dup(0);
 	close(2); dup(0);
 	printf("%s running as init on %s\n", argv[0], OnVTY ? "vty0" : "serial console");
-	i = ioctl(0, TIOCSCTTY, (char *)NULL);
+	ioctl(0, TIOCSCTTY, (char *)NULL);
 	setlogin("root");
 	setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1);
 	setbuf(stdin, 0);
 	setbuf(stderr, 0);
+#ifdef __alpha__
+	i = 0;
+	sysctlbyname("machdep.unaligned_print", NULL, 0, &i, sizeof(i));
+#endif
     }
     else {
 	char hname[256];
@@ -347,7 +353,7 @@ systemCreateHoloshell(void)
 	    if (kill(ehs_pid, 0) == 0) {
 
 		if (msgYesNo("There seems to be an emergency holographic shell\n"
-			     "already running on VTY 4.\n"
+			     "already running on VTY 4.\n\n"
 			     "Kill it and start a new one?"))
 		    return;