In preparation for MFC of sysinstall changes to edit /etc/ttys in

post-install config, reduce the potential confusion from the existence
of both configTTYs and configTtys by renaming configTTYs to
configEtcTtys.  While this is not a C naming conflict, it was probably
a poor choice of names on my part.

6 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index f50c75c..3a83157 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -1031,7 +1031,7 @@ configNFSServer(dialogMenuItem *self)
 }
 
 int
-configTTYs(dialogMenuItem *self)
+configEtcTtys(dialogMenuItem *self)
 {
     char cmd[256];
 
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 089407e..0fc31c2 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -270,7 +270,7 @@ DMenu MenuIndex = {
       { " Syscons, Screenmap",	"The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
       { " Syscons, Ttys",       "The console terminal type menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsTtys },
       { " Time Zone",		"Set the system's time zone.",		NULL, dmenuSystemCommand, NULL, "tzsetup" },
-      { " TTYs",		"Configure system ttys.",		NULL, configTTYs, NULL, "ttys" },
+      { " TTYs",		"Configure system ttys.",		NULL, configEtcTtys, NULL, "ttys" },
       { " Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { " Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { " User Management",	"Add user and group information.",	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
@@ -1250,7 +1250,7 @@ DMenu MenuConfigure = {
       { " Startup",	"Configure system startup options",
 	NULL,	dmenuSubmenu, NULL, &MenuStartup },
       { " TTYs",	"Configure system ttys.",
-	NULL,	configTTYs, NULL, "ttys" },
+	NULL,	configEtcTtys, NULL, "ttys" },
       { " Options",	"View/Set various installation options",
 	NULL, optionsEditor },
       { " XFree86",	"Configure XFree86 Server",
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 721aa00..79371e3 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -455,7 +455,7 @@ extern int	configSecurityFascist(dialogMenuItem *self);
 extern int	configSecurityHigh(dialogMenuItem *self);
 extern int	configSecurityModerate(dialogMenuItem *self);
 extern int	configSecurityLiberal(dialogMenuItem *self);
-extern int	configTTYs(dialogMenuItem *self);
+extern int	configEtcTtys(dialogMenuItem *self);
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index f50c75c..3a83157 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -1031,7 +1031,7 @@ configNFSServer(dialogMenuItem *self)
 }
 
 int
-configTTYs(dialogMenuItem *self)
+configEtcTtys(dialogMenuItem *self)
 {
     char cmd[256];
 
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 089407e..0fc31c2 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -270,7 +270,7 @@ DMenu MenuIndex = {
       { " Syscons, Screenmap",	"The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
       { " Syscons, Ttys",       "The console terminal type menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsTtys },
       { " Time Zone",		"Set the system's time zone.",		NULL, dmenuSystemCommand, NULL, "tzsetup" },
-      { " TTYs",		"Configure system ttys.",		NULL, configTTYs, NULL, "ttys" },
+      { " TTYs",		"Configure system ttys.",		NULL, configEtcTtys, NULL, "ttys" },
       { " Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { " Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { " User Management",	"Add user and group information.",	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
@@ -1250,7 +1250,7 @@ DMenu MenuConfigure = {
       { " Startup",	"Configure system startup options",
 	NULL,	dmenuSubmenu, NULL, &MenuStartup },
       { " TTYs",	"Configure system ttys.",
-	NULL,	configTTYs, NULL, "ttys" },
+	NULL,	configEtcTtys, NULL, "ttys" },
       { " Options",	"View/Set various installation options",
 	NULL, optionsEditor },
       { " XFree86",	"Configure XFree86 Server",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 721aa00..79371e3 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -455,7 +455,7 @@ extern int	configSecurityFascist(dialogMenuItem *self);
 extern int	configSecurityHigh(dialogMenuItem *self);
 extern int	configSecurityModerate(dialogMenuItem *self);
 extern int	configSecurityLiberal(dialogMenuItem *self);
-extern int	configTTYs(dialogMenuItem *self);
+extern int	configEtcTtys(dialogMenuItem *self);
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);