linux_cachyos: disable Tomoyo

chaotic-cx · Jul 28, 2024 · 57b6073 · 57b6073
1 parent a5dace3
commit 57b6073
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 25 deletions.
diff --git a/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-hardened.x86_64-linux.nix
@@ -8319,11 +8319,6 @@
   "CONFIG_SECURITY_SMACK_BRINGUP" = "y";
   "CONFIG_SECURITY_SMACK_NETFILTER" = "y";
   "CONFIG_SECURITY_SMACK_APPEND_SIGNALS" = "y";
-  "CONFIG_SECURITY_TOMOYO" = "y";
-  "CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY" = "2048";
-  "CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG" = "1024";
-  "CONFIG_SECURITY_TOMOYO_POLICY_LOADER" = "/usr/bin/tomoyo-init";
-  "CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER" = "/usr/lib/systemd/systemd";
   "CONFIG_SECURITY_APPARMOR" = "y";
   "CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY" = "y";
   "CONFIG_SECURITY_APPARMOR_HASH" = "y";

diff --git a/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix
@@ -8583,11 +8583,6 @@
   "CONFIG_SECURITY_SMACK_BRINGUP" = "y";
   "CONFIG_SECURITY_SMACK_NETFILTER" = "y";
   "CONFIG_SECURITY_SMACK_APPEND_SIGNALS" = "y";
-  "CONFIG_SECURITY_TOMOYO" = "y";
-  "CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY" = "2048";
-  "CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG" = "1024";
-  "CONFIG_SECURITY_TOMOYO_POLICY_LOADER" = "/usr/bin/tomoyo-init";
-  "CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER" = "/usr/lib/systemd/systemd";
   "CONFIG_SECURITY_APPARMOR" = "y";
   "CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY" = "y";
   "CONFIG_SECURITY_APPARMOR_HASH" = "y";

diff --git a/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix
@@ -8585,11 +8585,6 @@
   "CONFIG_SECURITY_SMACK_BRINGUP" = "y";
   "CONFIG_SECURITY_SMACK_NETFILTER" = "y";
   "CONFIG_SECURITY_SMACK_APPEND_SIGNALS" = "y";
-  "CONFIG_SECURITY_TOMOYO" = "y";
-  "CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY" = "2048";
-  "CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG" = "1024";
-  "CONFIG_SECURITY_TOMOYO_POLICY_LOADER" = "/usr/bin/tomoyo-init";
-  "CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER" = "/usr/lib/systemd/systemd";
   "CONFIG_SECURITY_APPARMOR" = "y";
   "CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY" = "y";
   "CONFIG_SECURITY_APPARMOR_HASH" = "y";

diff --git a/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix
@@ -8586,11 +8586,6 @@
   "CONFIG_SECURITY_SMACK_BRINGUP" = "y";
   "CONFIG_SECURITY_SMACK_NETFILTER" = "y";
   "CONFIG_SECURITY_SMACK_APPEND_SIGNALS" = "y";
-  "CONFIG_SECURITY_TOMOYO" = "y";
-  "CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY" = "2048";
-  "CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG" = "1024";
-  "CONFIG_SECURITY_TOMOYO_POLICY_LOADER" = "/usr/bin/tomoyo-init";
-  "CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER" = "/usr/lib/systemd/systemd";
   "CONFIG_SECURITY_APPARMOR" = "y";
   "CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY" = "y";
   "CONFIG_SECURITY_APPARMOR_HASH" = "y";

diff --git a/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix b/pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix
@@ -8587,11 +8587,6 @@
   "CONFIG_SECURITY_SMACK_BRINGUP" = "y";
   "CONFIG_SECURITY_SMACK_NETFILTER" = "y";
   "CONFIG_SECURITY_SMACK_APPEND_SIGNALS" = "y";
-  "CONFIG_SECURITY_TOMOYO" = "y";
-  "CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY" = "2048";
-  "CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG" = "1024";
-  "CONFIG_SECURITY_TOMOYO_POLICY_LOADER" = "/usr/bin/tomoyo-init";
-  "CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER" = "/usr/lib/systemd/systemd";
   "CONFIG_SECURITY_APPARMOR" = "y";
   "CONFIG_SECURITY_APPARMOR_INTROSPECT_POLICY" = "y";
   "CONFIG_SECURITY_APPARMOR_HASH" = "y";

diff --git a/pkgs/linux-cachyos/prepare.nix b/pkgs/linux-cachyos/prepare.nix
@@ -76,6 +76,9 @@ let
       "-d DEFAULT_FQ_CODEL"
       "-e DEFAULT_FQ"
       "--set-str DEFAULT_NET_SCH fq"
+
+      # Nixpkgs don't support this
+      "-d CONFIG_SECURITY_TOMOYO"
     ]
     ++ ltoConfig
     ++ ticksHzConfig