From aa56b3e45af3603513e8107f5cbdc00bc393d29c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 7 Apr 2021 12:06:34 +0200
Subject: [PATCH] system: reorder settings to let tunables override all

---
 src/etc/inc/system.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 7a202de72..08b7f3357 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1144,12 +1144,6 @@ function system_login_configure($verbose = false)
     /* copy settings already there */
     $new_loader_conf = @file_get_contents('/boot/loader.conf');
 
-    $new_loader_conf .= "# dynamically generated tunables settings follow\n";
-    foreach (system_sysctl_get() as $param => $value) {
-        $new_loader_conf .= "{$param}=\"{$value}\"\n";
-    }
-    $new_loader_conf .= "\n";
-
     $new_loader_conf .= "# dynamically generated console settings follow\n";
     foreach ($new_boot_config as $param => $value) {
         if (!empty($value)) {
@@ -1158,6 +1152,13 @@ function system_login_configure($verbose = false)
             $new_loader_conf .= "#${param}\n";
         }
     }
+    $new_loader_conf .= "\n";
+
+    $new_loader_conf .= "# dynamically generated tunables settings follow\n";
+    foreach (system_sysctl_get() as $param => $value) {
+        $new_loader_conf .= "{$param}=\"{$value}\"\n";
+    }
+
 
     /* write merged file back to target location */
     @file_put_contents('/boot/loader.conf', $new_loader_conf);