bmah> Comments on the text only (i.e. I haven't tested the new menus)...

Thank you.

I've (of course) tested; making floppies and do a test that sysinstall
saves sendmail_enable line to /etc/rc.conf.

-- -
Makoto `MAR' Matsushita

Index: menus.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.343
diff -u -r1.343 menus.c
--- menus.c     20 May 2002 17:08:00 -0000      1.343
+++ menus.c     1 Jun 2002 05:20:02 -0000
@@ -1372,11 +1372,31 @@
       { " Rwhod",      "This machine wants to run the rwho daemon",
        dmenuVarCheck,  dmenuToggleVariable, NULL, "rwhod_enable=YES" },
       { " Sendmail",   "This machine wants to run the sendmail daemon",
-       dmenuVarCheck,  dmenuToggleVariable, NULL, "sendmail_enable=YES" },
+       NULL,           dmenuSubmenu, NULL, &MenuSendmail },
       { " Sshd",       "This machine wants to run the ssh daemon",
        dmenuVarCheck,  dmenuToggleVariable, NULL, "sshd_enable=YES" },
       { " TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?",
        dmenuVarCheck,  dmenuToggleVariable, NULL, "tcp_extensions=YES" },
+      { NULL } },
+};
+
+DMenu MenuSendmail = {
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    "Sendmail Invocation Selection",
+    "There are three options for invoking sendmail at startup.\n"
+    "Please select Yes if you want to use sendmail as your mail transfer\n"
+    "agent.  Selecting No disables sendmail's network socket for incoming\n"
+    "email, but still enables sendmail for outbound mail.  None disables\n"
+    "sendmail completely at startup.",
+    NULL,
+    NULL,
+    {
+      { " Yes",                "Start sendmail",
+       dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=YES" },
+      { " No",         "Start sendmail, but don't listen from network",
+       dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=NO" },
+      { " None",       "Don't start any sendmail processes",
+       dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=NONE" },
       { NULL } },
 };
 
Index: sysinstall.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/sysinstall.h,v
retrieving revision 1.227
diff -u -r1.227 sysinstall.h
--- sysinstall.h        31 May 2002 13:38:17 -0000      1.227
+++ sysinstall.h        1 Jun 2002 05:20:02 -0000
@@ -407,6 +407,7 @@
 extern DMenu           MenuSysconsScrnmap;     /* System console screenmap 
configuration menu  */
 extern DMenu            MenuSysconsTtys;        /* System console terminal type menu  
          */
 extern DMenu           MenuNetworking;         /* Network configuration menu          
         */
+extern DMenu           MenuSendmail;           /* Sendmail configuration menu         
+         */
 extern DMenu           MenuInstallCustom;      /* Custom Installation menu            
         */
 extern DMenu           MenuDistributions;      /* Distribution menu                   
         */
 extern DMenu           MenuDiskDevices;        /* Disk type devices                   
         */

To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to