From 306b268114a36e3dcc5efff8105577e37fe33caf Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Fri, 18 Feb 2000 18:33:15 +0000 Subject: [PATCH] Invert the meaning of two questions in the Standard installation so just whapping "Yes" by default does not turn you into an anonymous FTP-supporting gateway machine. Those aren't the right "defaults." --- release/sysinstall/install.c | 7 ++++--- usr.sbin/sade/install.c | 7 ++++--- usr.sbin/sysinstall/install.c | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 38c22cc9d36f..4f8cf72b39cc 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -304,7 +304,7 @@ installFixitCDROM(dialogMenuItem *self) /* Yet more iggly hardcoded pathnames. */ Mkdir("/usr/libexec"); - if (!file_readable("/usr/libexec/ld.so")) { + if (!file_readable("/usr/libexec/ld.so") && file_readable("/mnt2/usr/libexec/ld.so")) { if (symlink("/mnt2/usr/libexec/ld.so", "/usr/libexec/ld.so")) msgDebug("Couldn't link to ld.so - not necessarily a problem for ELF\n"); } @@ -537,11 +537,12 @@ installStandard(dialogMenuItem *self) dialog_clear_norefresh(); } - if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" + if (msgYesNo("Will this machine be a leaf node (e.g. will not forward packets)\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) + if (!msgYesNo("Do you want to grant only normal users FTP access to this\n" + "host (e.g. no anonymous FTP connections)?")) configAnonFTP(self); if (!msgYesNo("Do you want to configure this machine as an NFS server?")) diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 38c22cc9d36f..4f8cf72b39cc 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -304,7 +304,7 @@ installFixitCDROM(dialogMenuItem *self) /* Yet more iggly hardcoded pathnames. */ Mkdir("/usr/libexec"); - if (!file_readable("/usr/libexec/ld.so")) { + if (!file_readable("/usr/libexec/ld.so") && file_readable("/mnt2/usr/libexec/ld.so")) { if (symlink("/mnt2/usr/libexec/ld.so", "/usr/libexec/ld.so")) msgDebug("Couldn't link to ld.so - not necessarily a problem for ELF\n"); } @@ -537,11 +537,12 @@ installStandard(dialogMenuItem *self) dialog_clear_norefresh(); } - if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" + if (msgYesNo("Will this machine be a leaf node (e.g. will not forward packets)\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) + if (!msgYesNo("Do you want to grant only normal users FTP access to this\n" + "host (e.g. no anonymous FTP connections)?")) configAnonFTP(self); if (!msgYesNo("Do you want to configure this machine as an NFS server?")) diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 38c22cc9d36f..4f8cf72b39cc 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -304,7 +304,7 @@ installFixitCDROM(dialogMenuItem *self) /* Yet more iggly hardcoded pathnames. */ Mkdir("/usr/libexec"); - if (!file_readable("/usr/libexec/ld.so")) { + if (!file_readable("/usr/libexec/ld.so") && file_readable("/mnt2/usr/libexec/ld.so")) { if (symlink("/mnt2/usr/libexec/ld.so", "/usr/libexec/ld.so")) msgDebug("Couldn't link to ld.so - not necessarily a problem for ELF\n"); } @@ -537,11 +537,12 @@ installStandard(dialogMenuItem *self) dialog_clear_norefresh(); } - if (!msgYesNo("Will this machine be an IP gateway (e.g. will it forward packets\n" + if (msgYesNo("Will this machine be a leaf node (e.g. will not forward packets)\n" "between interfaces)?")) variable_set2("gateway_enable", "YES", 1); - if (!msgYesNo("Do you want to allow anonymous FTP connections to this machine?")) + if (!msgYesNo("Do you want to grant only normal users FTP access to this\n" + "host (e.g. no anonymous FTP connections)?")) configAnonFTP(self); if (!msgYesNo("Do you want to configure this machine as an NFS server?"))