Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bind-dirs: run in DisposableVM, too

Browse Source 
Allow the user to configure bind-dirs in the dvm template and have that
configuration applied when a DisposableVM is instantiated.

Fixes QubesOS/qubes-issues#4624
Fixes QubesOS/qubes-issues#5618
This commit is contained in:
Rusty Bird 2020-09-15 10:52:59 +00:00
parent a695902d68
commit 4c4f2e7038
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vm-systemd/bind-dirs.sh
View File

@ -30,8 +30,8 @@ shopt -s nullglob dotglob
source /usr/lib/qubes/init/functions source /usr/lib/qubes/init/functions
prerequisite() { prerequisite() {
if ! is_rwonly_persistent ; then if is_fully_persistent ; then
echo "No TemplateBasedVM detected. Exiting." echo "No TemplateBasedVM/DisposableVM detected. Exiting."
exit 0 exit 0
fi fi
} }

2
vm-systemd/mount-dirs.sh
View File

@ -15,6 +15,4 @@ echo "Mounting /rw/home onto /home" >&2
mount /home mount /home
echo "Mounting /rw/usrlocal onto /usr/local" >&2 echo "Mounting /rw/usrlocal onto /usr/local" >&2
mount /usr/local mount /usr/local
# https://github.com/QubesOS/qubes-issues/issues/1328#issuecomment-169483029
# Do none of the following in a DispVM.
/usr/lib/qubes/init/bind-dirs.sh /usr/lib/qubes/init/bind-dirs.sh