Clean up several instances of SADE calling itself sysinstall.

(do so generically so the same set of changes can be applied to sysinstall)

5 files changed, 12 insertions, 10 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index b2a84f9a7523..b4f755f145c8 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -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);
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index ac3994a7da02..6b7c774b6cec 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -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"
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index df6cf329780b..05e55ec12022 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -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;
diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c
index 820d28dd346f..5cf0f2740bb1 100644
--- a/usr.sbin/sade/termcap.c
+++ b/usr.sbin/sade/termcap.c
@@ -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)
diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c
index 7809deb003fa..9abbcf4028d1 100644
--- a/usr.sbin/sade/variable.c
+++ b/usr.sbin/sade/variable.c
@@ -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;
     }