mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Move configResolv() to *after* the chroot(). This is what was causing
NFS installation to fail the first time. This will go into 2.2.
This commit is contained in:
parent
fb164f4e51
commit
a2a3d9f413
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=20064
3 changed files with 6 additions and 12 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue