Skip to content

Commit

Permalink
fix: fix fsguard (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
axtloss authored Jan 8, 2024
1 parent 76f10e0 commit db3de21
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: vanilla-os/[email protected]
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 .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vib-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: vanilla-os/[email protected]
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 .
Expand Down
2 changes: 1 addition & 1 deletion includes.container/usr/sbin/init
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
/usr/sbin/FsGuard verify /FsGuard/filelist
/usr/sbin/FsGuard verify /.system/FsGuard/filelist
exec /usr/lib/systemd/systemd "$@"
24 changes: 1 addition & 23 deletions recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit db3de21

Please sign in to comment.