481763
diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
481763
--- firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-03-18 14:48:36.000000000 +0100
481763
+++ firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-03-22 19:20:02.429310184 +0100
488d12
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
7468b5
     if (NS_FAILED(rv)) return rv;
4cf60e
 
7468b5
     rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
7468b5
-    if (NS_FAILED(rv)) return rv;
7468b5
+    if (NS_FAILED(rv)) {
7468b5
+      // Look for cfg file in /etc/<application>/pref
7468b5
+      rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
7468b5
+                                  getter_AddRefs(jsFile));
7468b5
+      NS_ENSURE_SUCCESS(rv, rv);
4cf60e
+
488d12
+      rv = jsFile->AppendNative(nsLiteralCString("pref"));
7468b5
+      NS_ENSURE_SUCCESS(rv, rv);
7468b5
+      rv = jsFile->AppendNative(nsDependentCString(aFileName));
7468b5
+      NS_ENSURE_SUCCESS(rv, rv);
d417c4
 
7468b5
+      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
7468b5
+      NS_ENSURE_SUCCESS(rv, rv);
7468b5
+    }
7468b5
   } else {
7468b5
     nsAutoCString location("resource://gre/defaults/autoconfig/");
7468b5
     location += aFileName;
481763
diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modules/libpref/Preferences.cpp
481763
--- firefox-87.0/modules/libpref/Preferences.cpp.1170092	2021-03-18 14:48:54.000000000 +0100
481763
+++ firefox-87.0/modules/libpref/Preferences.cpp	2021-03-22 19:20:02.429310184 +0100
481763
@@ -4499,6 +4499,9 @@ nsresult Preferences::InitInitialObjects
d417c4
   //
d417c4
   // Thus, in the omni.jar case, we always load app-specific default
d417c4
   // preferences from omni.jar, whether or not `$app == $gre`.
481763
+  //
4cf60e
+  // At very end load configuration from system config location:
4cf60e
+  // - /etc/firefox/pref/*.js
4cf60e
 
727eab
   nsresult rv = NS_ERROR_FAILURE;
e98f2c
   UniquePtr<nsZipFind> find;
481763
diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/toolkit/xre/nsXREDirProvider.cpp
481763
--- firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-03-18 14:52:00.000000000 +0100
481763
+++ firefox-87.0/toolkit/xre/nsXREDirProvider.cpp	2021-03-22 19:37:56.574480347 +0100
481763
@@ -65,6 +65,7 @@
4cf60e
 #endif
4cf60e
 #ifdef XP_UNIX
727eab
 #  include <ctype.h>
727eab
+#  include "nsIXULAppInfo.h"
4cf60e
 #endif
4cf60e
 #ifdef XP_IOS
727eab
 #  include "UIKitDirProvider.h"
481763
@@ -552,6 +553,21 @@ nsXREDirProvider::GetFile(const char* aP
4cf60e
       }
4cf60e
     }
4cf60e
   }
7468b5
+
4cf60e
+#if defined(XP_UNIX)
4cf60e
+  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
488d12
+    nsCString sysConfigDir = nsLiteralCString("/etc/");
4cf60e
+    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
4cf60e
+    if (!appInfo)
4cf60e
+      return NS_ERROR_NOT_AVAILABLE;
4cf60e
+    nsCString appName;
4cf60e
+    appInfo->GetName(appName);
4cf60e
+    ToLowerCase(appName);
4cf60e
+    sysConfigDir.Append(appName);
4cf60e
+    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
4cf60e
+  }
4cf60e
+#endif
4cf60e
+
7468b5
   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
4cf60e
 
7468b5
   if (ensureFilePermissions) {
481763
@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
488d12
     }
488d12
 #endif
481763
 
4cf60e
+    // Add /etc/<application>/pref/ directory if it exists
4cf60e
+    nsCOMPtr<nsIFile> systemPrefDir;
7468b5
+    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
7468b5
+                                getter_AddRefs(systemPrefDir));
4cf60e
+    if (NS_SUCCEEDED(rv)) {
488d12
+      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
481763
+      if (NS_SUCCEEDED(rv))
4cf60e
+        directories.AppendObject(systemPrefDir);
727eab
+      }
481763
+
727eab
     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
7468b5
   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
481763
     // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
481763
diff -up firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h
481763
--- firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2021-03-18 14:51:58.000000000 +0100
481763
+++ firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h	2021-03-22 19:20:02.430310213 +0100
488d12
@@ -59,6 +59,7 @@
7468b5
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
7468b5
 #define NS_APP_PREFS_OVERRIDE_DIR \
7468b5
   "PrefDOverride"  // Directory for per-profile defaults
4cf60e
+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR          "PrefSysConf"   // Directory with system-wide configuration
4cf60e
 
7468b5
 #define NS_APP_USER_PROFILE_50_DIR "ProfD"
7468b5
 #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"