Merge remote-tracking branch 'qubesos/pr/125'

* qubesos/pr/125:
  bind mount /usr/local

Fixes QubesOS/qubes-issues#1150
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-11 13:25:37 +02:00
commit c11dd76006
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 0 deletions

View File

@ -4,6 +4,7 @@
/dev/mapper/dmroot / ext4 defaults,discard,noatime 1 1
/dev/xvdb /rw auto noauto,defaults,discard 1 2
/rw/home /home none noauto,bind,defaults 0 0
/rw/usrlocal /usr/local none noauto,bind,defaults 0 0
/dev/xvdc1 swap swap defaults 0 0
tmpfs /dev/shm tmpfs defaults,size=1G 0 0
devpts /dev/pts devpts gid=5,mode=620 0 0

View File

@ -13,6 +13,8 @@ if [ -e /dev/xvdb ] ; then mount /rw ; fi
initialize_home "/rw/home" ifneeded
echo "Mounting /rw/home onto /home" >&2
mount /home
echo "Mounting /rw/usrlocal onto /usr/local" >&2
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