CARP, add option "Disable preempt", move preempt to later boot stage. for...

CARP, add option "Disable preempt", move preempt to later boot stage. for https://github.com/opnsense/core/issues/1557

CARP, add option "Disable preempt", move preempt to later boot stage. for...
CARP, add option "Disable preempt", move preempt to later boot stage. for https://github.com/opnsense/core/issues/1557
75967381 · Ad Schellevis · 6eda8aec · 75967381 · 75967381 · 75967381
Commit 75967381 authored May 01, 2017 by Ad Schellevis
5 changed files
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1676,8 +1676,6 @@ function interfaces_carp_setup($verbose = false)
        flush();
    }

-    set_single_sysctl("net.inet.carp.preempt", "1");
-
    if (!empty($config['hasync']['pfsyncinterface'])) {
        $carp_sync_int = get_real_interface($config['hasync']['pfsyncinterface']);
    }

--- a/src/etc/rc
+++ b/src/etc/rc
@@ -258,9 +258,6 @@ rm /var/run/booting
 # Execute the normal syshook / plugin commands
 /usr/local/etc/rc.syshook start

-# starting standard rc scripts
-/usr/local/etc/rc.opnsense start
-
 echo -n "Starting CRON..."
 cd /tmp && /usr/sbin/cron -s 2> /dev/null
 echo "done."

--- a/src/etc/rc.syshook.d/050-opnsense.start
+++ b/src/etc/rc.syshook.d/050-opnsense.start
+#!/bin/sh
+# opnsense rc scripting startup
+/usr/local/etc/rc.opnsense start
--- a/src/etc/rc.syshook.d/090-carp.start
+++ b/src/etc/rc.syshook.d/090-carp.start
+#!/usr/local/bin/php
+<?php
+/*
+    Copyright (C) 2017 Ad Schellevis (ad@opnsense.org)
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once("util.inc");
+require_once("config.inc");
+
+if (empty($config['hasync']) || empty($config['hasync']['disablepreempt'])) {
+    set_single_sysctl("net.inet.carp.preempt", "1");
+}
--- a/src/www/system_hasync.php
+++ b/src/www/system_hasync.php
@@ -37,6 +37,7 @@ $a_hasync = &$config['hasync'];

 $checkbox_names = array(
    'pfsyncenabled',
+    'disablepreempt',
    'synchronizealiases',
    'synchronizeauthservers',
    'synchronizecerts',
@@ -99,12 +100,12 @@ include("head.inc");
 <body>
 <?php include("fbegin.inc"); ?>
 <section class="page-content-main">
-  <div class="container-fluid">
-    <div class="row">
-      <section class="col-xs-12">
-        <div class="content-box">
-          <div class="table-responsive">
-            <form method="post">
+  <form method="post">
+    <div class="container-fluid">
+      <div class="row">
+        <section class="col-xs-12">
+          <div class="tab-content content-box col-xs-12 __mb">
+            <div class="table-responsive">
              <table class="table table-striped opnsense_standard_table_form">
                <tr>
                  <td width="22%"><strong><?=gettext('State Synchronization') ?></strong></td>
@@ -126,6 +127,15 @@ include("head.inc");
                    </div>
                  </td>
                </tr>
+                <tr>
+                  <td><a id="help_for_disablepreempt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disable preempt') ?></td>
+                  <td>
+                    <input type="checkbox" name="disablepreempt" value="on" <?= !empty($pconfig['disablepreempt']) ? "checked=\"checked\"" : "";?> />
+                    <div class="hidden" for="help_for_disablepreempt">
+                      <?=gettext("When this device is configured as CARP master it will try to switch to master when powering up, this option will keep this one slave if there already is a master on the network");?>
+                    </div>
+                  </td>
+                </tr>
                <tr>
                  <td><a id="help_for_pfsyncinterface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Synchronize Interface') ?></td>
                  <td>
@@ -162,6 +172,12 @@ include("head.inc");
                    </div>
                  </td>
                </tr>
+              </table>
+            </div>
+          </div>
+          <div class="tab-content content-box col-xs-12 __mb">
+            <div class="table-responsive">
+              <table class="table table-striped opnsense_standard_table_form">
                <tr>
                  <th colspan="2" class="listtopic"><?=gettext('Configuration Synchronization Settings (XMLRPC Sync)') ?></th>
                </tr>
@@ -316,12 +332,12 @@ include("head.inc");
                  </td>
                </tr>
              </table>
-            </form>
+            </div>
          </div>
-        </div>
-      </section>
+        </section>
+      </div>
    </div>
-  </div>
+  </form>
 </section>