summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-04-30 06:02:51 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-04-30 06:02:51 +0000
commit351ad0d904f72f4547a10037f37ba87a988301ee (patch)
treea8cd7380060626253dc7a4cdd04d96ca64489acc
parent7126da56c6ad5cf382fea3af2ceb7f799ae9a265 (diff)
Notes
-rw-r--r--release/sysinstall/install.c4
-rw-r--r--usr.sbin/sade/install.c4
-rw-r--r--usr.sbin/sysinstall/install.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 607c276fda30..0e4f0e515093 100644
--- a/release/sysinstall/install.c
+++ b/release/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.93 1996/04/29 21:15:42 jkh Exp $
+ * $Id: install.c,v 1.94 1996/04/30 05:23:46 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -382,7 +382,6 @@ installNovice(dialogMenuItem *self)
"No.\n\n"
"If you wish to re-enter this utility after the system is up, you\n"
"may do so by typing: /stand/sysinstall.");
- variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
if (!msgYesNo("Would you like to configure this machine's network interfaces?")) {
@@ -515,6 +514,7 @@ installCommit(dialogMenuItem *self)
"If you have any network devices you have not yet configured,\n"
"see the Interfaces configuration item on the Configuration menu.");
}
+ variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE | DITEM_RECREATE;
}
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 607c276fda30..0e4f0e515093 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.93 1996/04/29 21:15:42 jkh Exp $
+ * $Id: install.c,v 1.94 1996/04/30 05:23:46 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -382,7 +382,6 @@ installNovice(dialogMenuItem *self)
"No.\n\n"
"If you wish to re-enter this utility after the system is up, you\n"
"may do so by typing: /stand/sysinstall.");
- variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
if (!msgYesNo("Would you like to configure this machine's network interfaces?")) {
@@ -515,6 +514,7 @@ installCommit(dialogMenuItem *self)
"If you have any network devices you have not yet configured,\n"
"see the Interfaces configuration item on the Configuration menu.");
}
+ variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE | DITEM_RECREATE;
}
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 607c276fda30..0e4f0e515093 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.93 1996/04/29 21:15:42 jkh Exp $
+ * $Id: install.c,v 1.94 1996/04/30 05:23:46 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -382,7 +382,6 @@ installNovice(dialogMenuItem *self)
"No.\n\n"
"If you wish to re-enter this utility after the system is up, you\n"
"may do so by typing: /stand/sysinstall.");
- variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
if (!msgYesNo("Would you like to configure this machine's network interfaces?")) {
@@ -515,6 +514,7 @@ installCommit(dialogMenuItem *self)
"If you have any network devices you have not yet configured,\n"
"see the Interfaces configuration item on the Configuration menu.");
}
+ variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE | DITEM_RECREATE;
}