Skip to content

New custom-persist feature #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 1, 2025
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1d16aea
custom-persist: ignore /rw/config bind-dirs if custom-persist enabled
Guiiix Jan 19, 2025
6e7bed0
custom-persist: systemd mount units for /home and /usr/local and serv…
Guiiix Jan 23, 2025
2ac91d7
custom-persist: mount binds configured in qubes-db
Guiiix Jan 26, 2025
91d312a
custom-persist: disable /home and /usr/local mounts
Guiiix Jan 26, 2025
ec86885
custom-persist: disable user firewall rules when custom persist is en…
Guiiix Jan 26, 2025
8042e29
custom-persist: do not read user rc.local scripts when the feature is…
Guiiix Jan 26, 2025
e5209c8
custom-persist: user suspend modules blacklist
Guiiix Jan 26, 2025
e47e285
custom-persist: init.d compatibility
Guiiix Jan 28, 2025
bfe56a8
fix under_systemd function on debian
Guiiix Jan 28, 2025
e0003fc
fix: bind-dirs should create files parent directories if they don't e…
Guiiix Feb 19, 2025
c778254
custom-persist: files and directory auto-creation
Guiiix Feb 19, 2025
4d12979
custom-persist: prefer objets pre-creation in /rw
Guiiix Feb 23, 2025
ff6742c
custom-persist: handle mounts from /rw/home and /rw/usrlocal
Guiiix Feb 23, 2025
385f3fe
bind-dirs: fix /rw/home and /rw/usrlocal initialization from template…
Guiiix Feb 23, 2025
55d297b
custom-persist: pre-create parents with correct ownership
Guiiix Feb 27, 2025
0a8274b
custom-persist: prevent mount units from starting instead of bind mou…
Guiiix Feb 27, 2025
f18831c
bind-dirs: add x-gvfs-hide mount option to bind dirs
Guiiix Feb 27, 2025
cc84ec6
bind-dirs: fix permissions on $fso_ro
Guiiix Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
custom-persist: ignore /rw/config bind-dirs if custom-persist enabled
When the custom-persist feature is enabled, we no longer need to worry about the bind directories configured in /rw/config/qubes-bind-dirs.d.
  • Loading branch information
Guiiix committed Jan 28, 2025
commit 1d16aea9c3f7376a5176b20283b7c2f3705c6bc2
7 changes: 6 additions & 1 deletion vm-systemd/bind-dirs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ main() {
}

binds=()
for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/config/qubes-bind-dirs.d ; do
sources=( "/usr/lib/qubes-bind-dirs.d" "/etc/qubes-bind-dirs.d" )
if [ ! -f "/var/run/qubes-service/custom-persist" ]; then
sources+=( "/rw/config/qubes-bind-dirs.d" )
fi

for source_folder in "${sources[@]}"; do
true "source_folder: $source_folder"
if [ ! -d "$source_folder" ]; then
continue
Expand Down