Skip to content

Commit

Permalink
Merge pull request #23 from Vanilla-OS/feat/fsguard
Browse files Browse the repository at this point in the history
feat: Implement FsGuard
  • Loading branch information
axtloss authored Jan 13, 2024
2 parents 68765ba + 91d4cee commit 849d61d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 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/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.2-1'

- name: Build the Docker image
run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/core: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/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.2-1'

- name: Build the Docker image
run: docker image build -f Containerfile --tag vanillaos/core:validation .
Expand Down
9 changes: 9 additions & 0 deletions modules/03-fswarn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: fswarn
type: shell
commands:
- mkdir -p /boot/
- cp /sources/fswarn-x86_64.squash /boot/fswarn.squash
source:
type: tar
url: https://github.com/Vanilla-OS/fswarn/releases/download/v1.0-1/fswarn.tar.xz
checksum: 52f66710132138c21b81b56cb2d6edc7e59ad6eef4a4065b81af0f852d827dab
10 changes: 9 additions & 1 deletion recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ modules:
- modules/00-vanilla-apx
- modules/00-vanilla-apx-stacks
- modules/00-vanilla-ikaros
- modules/03-fswarn
- modules/05-firmware
- modules/10-input-and-locale
- modules/20-ssh
Expand All @@ -41,6 +42,13 @@ modules:
- modules/140-manpages
- modules/999-replace-locale-gen

- name: fsguard-runtime-deps
type: apt
source:
packages:
- "minisign"
- "squashfs-tools"

- name: cleanup1
type: shell
commands:
Expand All @@ -51,7 +59,7 @@ modules:

- name: fsguard
type: fsguard
FsGuardLocation: "/usr/sbin/init"
FsGuardLocation: "/usr/sbin/FsGuard"
GenerateKey: true
FilelistPaths: ["/usr/bin"]
modules:
Expand Down

0 comments on commit 849d61d

Please sign in to comment.