diff options
| author | jkh <jkh@FreeBSD.org> | 1996-12-01 12:27:36 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-12-01 12:27:36 +0000 |
| commit | c749eba5c51d9a26854e1b7f4dd60d6a66b77813 (patch) | |
| tree | 178b7865dd108e07ad0ff988a3c13f941210185b /usr.sbin | |
| parent | 57d00c9654b896bb050aee84a16b7784ce8f2165 (diff) | |
| download | FreeBSD-src-c749eba5c51d9a26854e1b7f4dd60d6a66b77813.zip FreeBSD-src-c749eba5c51d9a26854e1b7f4dd60d6a66b77813.tar.gz | |
Move configResolv() to *after* the chroot(). This is what was causing
NFS installation to fail the first time. This will go into 2.2.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/install.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 0869830..4734d77 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.141 1996/11/14 05:46:22 jkh Exp $ + * $Id: install.c,v 1.142 1996/11/16 22:42:13 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -233,6 +233,7 @@ installInitial(void) chdir("/"); variable_set2(RUNNING_ON_ROOT, "yes"); + configResolv(); /* stick a helpful shell over on the 4th VTY */ systemCreateHoloshell(); @@ -357,7 +358,6 @@ installExpress(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); } return i | DITEM_RECREATE; @@ -505,7 +505,6 @@ installNovice(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); return DITEM_LEAVE_MENU | DITEM_RECREATE; @@ -523,7 +522,6 @@ installCustomCommit(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); return i; } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 0869830..4734d77 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.141 1996/11/14 05:46:22 jkh Exp $ + * $Id: install.c,v 1.142 1996/11/16 22:42:13 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -233,6 +233,7 @@ installInitial(void) chdir("/"); variable_set2(RUNNING_ON_ROOT, "yes"); + configResolv(); /* stick a helpful shell over on the 4th VTY */ systemCreateHoloshell(); @@ -357,7 +358,6 @@ installExpress(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); } return i | DITEM_RECREATE; @@ -505,7 +505,6 @@ installNovice(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); return DITEM_LEAVE_MENU | DITEM_RECREATE; @@ -523,7 +522,6 @@ installCustomCommit(dialogMenuItem *self) installConfigure(); /* Now write out any changes .. */ - configResolv(); configSysconfig("/etc/sysconfig"); return i; } |
