Sync program name agnostic changes with SADE.

This commit is contained in:
David E. O'Brien 2008-05-11 07:18:22 +00:00
parent 228a522072
commit 244fb23f20
4 changed files with 10 additions and 8 deletions

View file

@ -187,8 +187,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);
}
}

View file

@ -1281,7 +1281,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"
"sysinstall first.");
"%s first.", StartName);
}
else if (!msgNoYes("WARNING: This should only be used when modifying an EXISTING\n"
"installation. If you are installing FreeBSD for the first time\n"

View file

@ -365,10 +365,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/sysinstall/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/sysinstall/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;

View file

@ -243,12 +243,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");
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;
}