diff options
| author | jkh <jkh@FreeBSD.org> | 1999-09-01 04:29:30 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-09-01 04:29:30 +0000 |
| commit | 2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae (patch) | |
| tree | 629d137afaab5d765bfc0fc21e0220e1f8acb9c7 /usr.sbin/sade/system.c | |
| parent | 73a7a67d13cba01eb39397ff54125ce8d3e6f8cc (diff) | |
| download | FreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.zip FreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.tar.gz | |
MFC: Catch 3.2-stable sysinstall up to 4.0-current level functionality,
bringing in DHCP support. The only thing I left out were Poul-Henning's
newfs changes since I'm not sure if he's brought the rest of that support
into -stable yet. If it turns out that this is the case, I'll MFC those
changes too.
Diffstat (limited to 'usr.sbin/sade/system.c')
| -rw-r--r-- | usr.sbin/sade/system.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index fc57fe3..d46ff5d 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -71,9 +71,7 @@ expand(char *fname) void systemInitialize(int argc, char **argv) { -#ifdef __alpha__ int i; -#endif signal(SIGINT, SIG_IGN); globalsInit(); @@ -111,15 +109,11 @@ 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"); - ioctl(0, TIOCSCTTY, (char *)NULL); + i = 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]; @@ -353,7 +347,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\n" + "already running on VTY 4.\n" "Kill it and start a new one?")) return; |
