diff options
author | obrien <obrien@FreeBSD.org> | 2008-05-11 07:18:22 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2008-05-11 07:18:22 +0000 |
commit | 31881edb1478b41d8785c5e1b8a3931271d97755 (patch) | |
tree | 9938c2106eeecc173b8cbb775c6cef8e8f29dcb9 | |
parent | 2d5be982d386d844d0bf6c6c0e0e9483d797de8c (diff) | |
download | FreeBSD-src-31881edb1478b41d8785c5e1b8a3931271d97755.zip FreeBSD-src-31881edb1478b41d8785c5e1b8a3931271d97755.tar.gz |
Sync program name agnostic changes with SADE.
-rw-r--r-- | usr.sbin/sysinstall/config.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/label.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/system.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/variable.c | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index baca42a..b101149 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -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); } } diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index c930561..3119515 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -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" diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 4705b63..ad5ab20 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -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; diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c index 694b8be..ba6ca9f 100644 --- a/usr.sbin/sysinstall/variable.c +++ b/usr.sbin/sysinstall/variable.c @@ -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; } |