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:26:49
@@ -926,6 +926,39 @@
     return ret;
 }
 
+#if defined(__i386__) || (__ia64__)
+static short acpi_apm_switch = 0;
+
+int
+configACPI(dialogMenuItem *self)
+{
+    WINDOW *w = savescr();
+    FILE *fp;
+    
+    if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
+	fprintf(fp, "# -- sysinstall generated deltas -- #\n");
+	fprintf(fp, "unset acpi_load\n");
+	fprintf(fp, "$hint.acpi.0.disabled=\"1\"\n");
+    }
+/*
+	dialog_clear_norefresh();
+    dmenuOpenSimple(&MenuSecurityProfile, FALSE); */
+    restorescr(w);
+    return DITEM_SUCCESS;
+}
+
+int
+configAPM(dialogMenuItem *self)
+{
+    WINDOW *w = savescr();
+
+    dialog_clear_norefresh();
+    dmenuOpenSimple(&MenuSecurityProfile, FALSE); 
+    restorescr(w);
+    return DITEM_SUCCESS;
+}
+#endif
+
 int
 configInetd(dialogMenuItem *self)
 {
@@ -941,7 +974,12 @@
         variable_set2("inetd_enable", "NO", 1);
     } else {
         /* If inetd is enabled, we'll need an inetd.conf */
+<<<<<<< config.c
+            variable_set2("inetd_enable", "YES", 1);
+
+=======
         variable_set2("inetd_enable", "YES", 1);
+>>>>>>> 1.209
 	if (!msgYesNo("inetd(8) relies on its configuration file, /etc/inetd.conf, to determine\n"
                    "which of its Internet services will be available.  The default FreeBSD\n"
                    "inetd.conf(5) leaves all services disabled by default, so they must be\n"
@@ -950,6 +988,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/inetd.conf, creating it ...");
+
             sprintf(cmd, "%s /etc/inetd.conf", variable_get(VAR_EDITOR));
             dialog_clear();
             systemExecute(cmd);