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

Clean up several instances of SADE calling itself sysinstall.

Browse Source 
(do so generically so the same set of changes can be applied to sysinstall)
This commit is contained in:
David E. O'Brien 2008-05-11 07:13:08 +00:00
parent 4b0532806f
commit 228a522072
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=178940
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,8 +181,8 @@ configFstab(dialogMenuItem *self)
return DITEM_SUCCESS;
else {
msgConfirm("Attempting to rebuild your /etc/fstab file. Warning: If you had\n"
"any CD devices in use before running sysinstall then they may NOT\n"
"be found by this run!");
"any CD devices in use before running %s then they may NOT\n"
"be found by this run!", StartName);
}
devs = deviceFind(NULL, DEVICE_TYPE_DISK);

2
usr.sbin/sade/label.c
View File

@ -1276,7 +1276,7 @@ diskLabel(Device *dev)
if (!variable_cmp(DISK_LABELLED, "written")) {
msgConfirm("You've already written out your changes - if you\n"
"wish to overwrite them, you'll have to restart\n"
"sade first.");
"%s first.", StartName);
}
else if (!msgNoYes("WARNING: You are about to modify an EXISTING\n"
"installation.\n\n"

6
usr.sbin/sade/system.c
View File

@ -233,10 +233,12 @@ systemHelpFile(char *file, char *buf)
snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sade/help/%s.hlp", file);
snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.hlp", StartName,
file);
if (file_readable(buf))
return buf;
snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sade/help/%s.TXT", file);
snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.TXT", StartName,
file);
if (file_readable(buf))
return buf;
return NULL;

2
usr.sbin/sade/termcap.c
View File

@ -45,7 +45,7 @@ set_termcap(void)
stat = ioctl(STDERR_FILENO, GIO_COLOR, &ColorDisplay);
if (isDebug())
DebugFD = open("sysinstall.debug", O_WRONLY|O_CREAT|O_TRUNC, 0644);
DebugFD = open("sade.debug", O_WRONLY|O_CREAT|O_TRUNC, 0644);
else
DebugFD = -1;
if (DebugFD < 0)

8
usr.sbin/sade/variable.c
View File

@ -238,12 +238,12 @@ dump_variables(dialogMenuItem *unused)
Variable *vp;
if (isDebug())
msgDebug("Writing sysinstall variables to file..\n");
msgDebug("Writing %s variables to file..\n", StartName);
fp = fopen("/etc/sysinstall.vars", "w");
fp = fopen("/etc/sade.vars", "w");
if (!fp) {
msgConfirm("Unable to write to /etc/sysinstall.vars: %s",
strerror(errno));
msgConfirm("Unable to write to /etc/%s.vars: %s",
StartName, strerror(errno));
return DITEM_FAILURE;
}