From db3de2193617dc385557d7ff405934584d574680 Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@disroot.org>
Date: Mon, 8 Jan 2024 20:41:00 +0100
Subject: [PATCH] fix: fix fsguard (#44)

---
 .github/workflows/vib-build.yml  |  2 +-
 .github/workflows/vib-pr.yml     |  2 +-
 includes.container/usr/sbin/init |  2 +-
 recipe.yml                       | 24 +-----------------------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml
index e6895b4..ae9618a 100644
--- a/.github/workflows/vib-build.yml
+++ b/.github/workflows/vib-build.yml
@@ -21,7 +21,7 @@ jobs:
     - uses: vanilla-os/vib-gh-action@v0.3.3-1
       with:
         recipe: 'recipe.yml'
-        plugins: 'Vanilla-OS/vib-fsguard:v1.0-3'
+        plugins: 'Vanilla-OS/vib-fsguard:v1.1-1'
 
     - name: Build the Docker image
       run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/desktop:main .
diff --git a/.github/workflows/vib-pr.yml b/.github/workflows/vib-pr.yml
index 92cef88..706e155 100644
--- a/.github/workflows/vib-pr.yml
+++ b/.github/workflows/vib-pr.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: vanilla-os/vib-gh-action@v0.3.3-1
       with:
         recipe: 'recipe.yml'
-        plugins: 'Vanilla-OS/vib-fsguard:v1.0-3'
+        plugins: 'Vanilla-OS/vib-fsguard:v1.1-1'
 
     - name: Build the Docker image
       run: docker image build -f Containerfile --tag vanillaos/desktop .
diff --git a/includes.container/usr/sbin/init b/includes.container/usr/sbin/init
index 076d8ea..b191d6c 100644
--- a/includes.container/usr/sbin/init
+++ b/includes.container/usr/sbin/init
@@ -1,3 +1,3 @@
 #!/bin/bash
-/usr/sbin/FsGuard verify /FsGuard/filelist
+/usr/sbin/FsGuard verify /.system/FsGuard/filelist
 exec /usr/lib/systemd/systemd "$@"
diff --git a/recipe.yml b/recipe.yml
index b1ff201..b0ee963 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -74,24 +74,6 @@ modules:
   commands:
   - rm /usr/lib/*/gnome-software/plugins-20/libgs_plugin_packagekit.so
 
-- name: build-fsguard
-  type: go
-  source:
-    type: git
-    url: https://github.com/linux-immutability-tools/FsGuard
-    tag: v0.1.2
-  modules:
-    - name: install go
-      type: apt
-      source:
-        packages:
-          - golang
-    - name: config-patch
-      type: shell
-      commands:
-        - patch -u /sources/build-fsguard/config/config.go -i /fsguard_config.patch
-        - rm /fsguard_config.patch
-
 - name: cleanup
   type: shell
   commands:
@@ -101,15 +83,11 @@ modules:
 
 - name: fsguard
   type: fsguard
-  CustomFsGuard: true
+  CustomFsGuard: false
   FsGuardLocation: "/usr/sbin/FsGuard"
   GenerateKey: true
   FilelistPaths: ["/usr/bin"]
   modules:
-    - name: install-built-fsguard
-      type: shell
-      commands:
-        - cp /sources/build-fsguard/build-fsguard /sources/FsGuard
     - name: remove-prev-fsguard
       type: shell
       commands: