diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/install.c | 7 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 7 |
2 files changed, 8 insertions, 6 deletions
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 @@ nodisks: 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 @@ nodisks: 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?")) |