Index: menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.368 diff -u -r1.368 menus.c --- menus.c 2003/02/03 16:14:33 1.368 +++ menus.c 2003/02/06 09:40:33 @@ -1481,17 +1481,17 @@ "configure", { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, - { " Distributions", "Install additional distribution sets", + { "Distributions", "Install additional distribution sets", NULL, distExtractAll }, { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, { " Root Password", "Set the system manager's password", NULL, dmenuSystemCommand, NULL, "passwd root" }, #ifdef WITH_SLICES - { " Fdisk", "The disk Slice (PC-style partition) Editor", + { "Fdisk", "The disk Slice (PC-style partition) Editor", NULL, diskPartitionEditor }, #endif - { " Label", "The disk Label editor", + { "Label", "The disk Label editor", NULL, diskLabelEditor }, { " User Management", "Add user and group information", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, @@ -1501,13 +1501,13 @@ #endif { " Time Zone", "Set which time zone you're in", NULL, dmenuSystemCommand, NULL, "tzsetup" }, - { " Media", "Change the installation media type", + { "Media", "Change the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, #ifdef WITH_MICE { " Mouse", "Configure your mouse", NULL, dmenuSubmenu, NULL, &MenuMouse, NULL }, #endif - { " Networking", "Configure additional network services", + { "Networking", "Configure additional network services", NULL, dmenuSubmenu, NULL, &MenuNetworking }, { " Security", "Configure system security options", NULL, dmenuSubmenu, NULL, &MenuSecurity }, @@ -1539,7 +1539,7 @@ { { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, #ifdef __i386__ - { " APM", "Auto-power management services (typically laptops)", + { " APM", "Advanced Power Management systems (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, #endif #ifdef PCCARD_ARCH @@ -1586,7 +1586,7 @@ { " OSF/1", "This host wants to be able to run DEC OSF/1 binaries.", dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" }, #endif - { " quotas", "This host wishes to check quotas on startup.", + { " Quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { NULL } }, }; @@ -1754,12 +1754,12 @@ { "Spain", "slug.ctv.es", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=slug.ctv.es" }, - { "Finland", "tick.keso.fi", + { "Finland", "time1.mikes.fi", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=tick.keso.fi" }, - { "Finland #2", "tock.keso.fi", + "ntpdate_enable=YES,ntpdate_flags=time1.mikes.fi" }, + { "Finland #2", "time2.mikes.fi", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=tock.keso.fi" }, + "ntpdate_enable=YES,ntpdate_flags=time2.mikes.fi" }, { "France", "ntp.obspm.fr", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.obspm.fr" }, Index: config.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/config.c,v retrieving revision 1.209 diff -u -r1.209 config.c --- config.c 2003/02/06 01:55:40 1.209 +++ config.c 2003/02/06 09:40:34 @@ -950,6 +950,9 @@ "IPv6 must be separately enabled from IPv4 services.\n\n" "Select [Yes] now to invoke an editor on /etc/inetd.conf, or [No] to\n" "use the current settings.\n")) { + if(!file_readable("/etc/inetd.conf")) + msgConfirm("Could not find /etc/inet.conf, creating it ..."); + sprintf(cmd, "%s /etc/inetd.conf", variable_get(VAR_EDITOR)); dialog_clear(); systemExecute(cmd);