mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-04 09:09:56 +00:00
Code Issues Releases Activity

Sync with 2.2-stable branch.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1998-03-24 09:51:58 +00:00
parent d3c155fc56
commit ac4c856698
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=34867
10 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.108 1998/03/10 17:24:03 jkh Exp $
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -343,10 +343,9 @@ configEnvironmentResolv(char *config)
if (!strncmp(lines[i], "domain", 6) && !variable_get(VAR_DOMAINNAME))
variable_set2(VAR_DOMAINNAME, string_skipwhite(string_prune(lines[i] + 6)));
else if (!strncmp(lines[i], "nameserver", 10) && !name_set) {
else if (!name_set && !strncmp(lines[i], "nameserver", 10)) {
/* Only take the first nameserver setting - we're lame */
variable_set2(VAR_NAMESERVER, string_skipwhite(string_prune(lines[i] + 10)));
name_set = TRUE;
}
free(lines[i]);
}

5
release/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.52 1997/11/13 11:44:42 jkh Exp $
* $Id: index.c,v 1.53 1998/03/23 05:59:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -69,6 +69,7 @@ static char *descrs[] = {
"astro", "Applications related to astronomy.",
"archivers", "Utilities for archiving and unarchiving data.",
"audio", "Audio utilities - most require a supported sound card.",
"biology", "Software related to Biology.",
"benchmarks", "Utilities for measuring system performance.",
"benchmarking", "Utilities for measuring system performance.",
"cad", "Computer Aided Design utilities.",
@ -86,6 +87,7 @@ static char *descrs[] = {
"german", "Ported software for Germanic countries.",
"graphics", "Graphics libraries and utilities.",
"japanese", "Ported software for the Japanese market.",
"kde", "Software for the K Desktop Environment.",
"korean", "Ported software for the Korean market.",
"lang", "Computer languages.",
"languages", "Computer languages.",
@ -100,6 +102,7 @@ static char *descrs[] = {
"numeric", "Mathematical computation software.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"pilot", "Software support for the USR Palm Pilot(tm).",
"plan9", "Software from the plan9 Operating System.",
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",

4
release/sysinstall/install.c
View File

@ -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.206 1998/03/09 15:00:56 jkh Exp $
* $Id: install.c,v 1.207 1998/03/10 13:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -541,7 +541,7 @@ installNovice(dialogMenuItem *self)
dialog_clear_norefresh();
if (!msgYesNo("Do you want to configure this machine as an NFS client?"))
variable_set2("nfs_client", "YES");
variable_set2("nfs_client_enable", "YES");
dialog_clear_norefresh();
if (!msgYesNo("Would you like to customize your system console settings?")) {

19
release/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.55 1998/03/21 02:08:52 jkh Exp $
* $Id: installUpgrade.c,v 1.56 1998/03/23 08:36:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -100,7 +100,11 @@ static HitList etc_files [] = {
{ JUST_COPY, "profile", TRUE, NULL },
{ JUST_COPY, "protocols", TRUE, NULL },
{ JUST_COPY, "pwd.db", TRUE, NULL },
{ JUST_COPY, "rc", TRUE, NULL },
{ JUST_COPY, "rc.firewall", TRUE, NULL },
{ JUST_COPY, "rc.i386", TRUE, NULL },
{ JUST_COPY, "rc.local", TRUE, NULL },
{ JUST_COPY, "rc.network", TRUE, NULL },
{ JUST_COPY, "rc.conf", FALSE, NULL },
{ JUST_COPY, "remote", TRUE, NULL },
{ JUST_COPY, "resolv.conf", TRUE, NULL },
@ -353,12 +357,13 @@ installUpgrade(dialogMenuItem *self)
traverseHitlist(etc_files);
}
msgConfirm("OK! At this stage, we've resurrected all the /etc files\n"
"and moved each new copy over to /etc/upgrade/<file> in case you want\n"
"to see what the new versions look like. If you want to wander over\n"
"to the Emergency Holographic Shell [ALT-F4] at this point to do\n"
"that, now would be a good time. When you're ready to reboot into\n"
"the new system, just exit the installation.");
msgConfirm("Upgrade completed! All of your old /etc files have been restored.\n"
"For your reference, the new /etc files are in /etc/upgrade/ in case\n"
"you wish to upgrade these files by hand (though that should not be\n"
"strictly necessary). If your root partition is specified in /etc/fstab\n"
"using the old \"compatibility\" slice, you may also wish to update it to\n"
"use a fully qualified slice name in order to avoid warnings on startup.\n\n"
"When you're ready to reboot into the new system, simply exit the installation.");
return DITEM_SUCCESS | DITEM_REDRAW;
}

5
usr.sbin/sade/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.108 1998/03/10 17:24:03 jkh Exp $
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -343,10 +343,9 @@ configEnvironmentResolv(char *config)
if (!strncmp(lines[i], "domain", 6) && !variable_get(VAR_DOMAINNAME))
variable_set2(VAR_DOMAINNAME, string_skipwhite(string_prune(lines[i] + 6)));
else if (!strncmp(lines[i], "nameserver", 10) && !name_set) {
else if (!name_set && !strncmp(lines[i], "nameserver", 10)) {
/* Only take the first nameserver setting - we're lame */
variable_set2(VAR_NAMESERVER, string_skipwhite(string_prune(lines[i] + 10)));
name_set = TRUE;
}
free(lines[i]);
}

4
usr.sbin/sade/install.c
View File

@ -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.206 1998/03/09 15:00:56 jkh Exp $
* $Id: install.c,v 1.207 1998/03/10 13:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -541,7 +541,7 @@ installNovice(dialogMenuItem *self)
dialog_clear_norefresh();
if (!msgYesNo("Do you want to configure this machine as an NFS client?"))
variable_set2("nfs_client", "YES");
variable_set2("nfs_client_enable", "YES");
dialog_clear_norefresh();
if (!msgYesNo("Would you like to customize your system console settings?")) {

5
usr.sbin/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.108 1998/03/10 17:24:03 jkh Exp $
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -343,10 +343,9 @@ configEnvironmentResolv(char *config)
if (!strncmp(lines[i], "domain", 6) && !variable_get(VAR_DOMAINNAME))
variable_set2(VAR_DOMAINNAME, string_skipwhite(string_prune(lines[i] + 6)));
else if (!strncmp(lines[i], "nameserver", 10) && !name_set) {
else if (!name_set && !strncmp(lines[i], "nameserver", 10)) {
/* Only take the first nameserver setting - we're lame */
variable_set2(VAR_NAMESERVER, string_skipwhite(string_prune(lines[i] + 10)));
name_set = TRUE;
}
free(lines[i]);
}

5
usr.sbin/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.52 1997/11/13 11:44:42 jkh Exp $
* $Id: index.c,v 1.53 1998/03/23 05:59:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -69,6 +69,7 @@ static char *descrs[] = {
"astro", "Applications related to astronomy.",
"archivers", "Utilities for archiving and unarchiving data.",
"audio", "Audio utilities - most require a supported sound card.",
"biology", "Software related to Biology.",
"benchmarks", "Utilities for measuring system performance.",
"benchmarking", "Utilities for measuring system performance.",
"cad", "Computer Aided Design utilities.",
@ -86,6 +87,7 @@ static char *descrs[] = {
"german", "Ported software for Germanic countries.",
"graphics", "Graphics libraries and utilities.",
"japanese", "Ported software for the Japanese market.",
"kde", "Software for the K Desktop Environment.",
"korean", "Ported software for the Korean market.",
"lang", "Computer languages.",
"languages", "Computer languages.",
@ -100,6 +102,7 @@ static char *descrs[] = {
"numeric", "Mathematical computation software.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"pilot", "Software support for the USR Palm Pilot(tm).",
"plan9", "Software from the plan9 Operating System.",
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",

4
usr.sbin/sysinstall/install.c
View File

@ -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.206 1998/03/09 15:00:56 jkh Exp $
* $Id: install.c,v 1.207 1998/03/10 13:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -541,7 +541,7 @@ installNovice(dialogMenuItem *self)
dialog_clear_norefresh();
if (!msgYesNo("Do you want to configure this machine as an NFS client?"))
variable_set2("nfs_client", "YES");
variable_set2("nfs_client_enable", "YES");
dialog_clear_norefresh();
if (!msgYesNo("Would you like to customize your system console settings?")) {

19
usr.sbin/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.55 1998/03/21 02:08:52 jkh Exp $
* $Id: installUpgrade.c,v 1.56 1998/03/23 08:36:27 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -100,7 +100,11 @@ static HitList etc_files [] = {
{ JUST_COPY, "profile", TRUE, NULL },
{ JUST_COPY, "protocols", TRUE, NULL },
{ JUST_COPY, "pwd.db", TRUE, NULL },
{ JUST_COPY, "rc", TRUE, NULL },
{ JUST_COPY, "rc.firewall", TRUE, NULL },
{ JUST_COPY, "rc.i386", TRUE, NULL },
{ JUST_COPY, "rc.local", TRUE, NULL },
{ JUST_COPY, "rc.network", TRUE, NULL },
{ JUST_COPY, "rc.conf", FALSE, NULL },
{ JUST_COPY, "remote", TRUE, NULL },
{ JUST_COPY, "resolv.conf", TRUE, NULL },
@ -353,12 +357,13 @@ installUpgrade(dialogMenuItem *self)
traverseHitlist(etc_files);
}
msgConfirm("OK! At this stage, we've resurrected all the /etc files\n"
"and moved each new copy over to /etc/upgrade/<file> in case you want\n"
"to see what the new versions look like. If you want to wander over\n"
"to the Emergency Holographic Shell [ALT-F4] at this point to do\n"
"that, now would be a good time. When you're ready to reboot into\n"
"the new system, just exit the installation.");
msgConfirm("Upgrade completed! All of your old /etc files have been restored.\n"
"For your reference, the new /etc files are in /etc/upgrade/ in case\n"
"you wish to upgrade these files by hand (though that should not be\n"
"strictly necessary). If your root partition is specified in /etc/fstab\n"
"using the old \"compatibility\" slice, you may also wish to update it to\n"
"use a fully qualified slice name in order to avoid warnings on startup.\n\n"
"When you're ready to reboot into the new system, simply exit the installation.");
return DITEM_SUCCESS | DITEM_REDRAW;
}