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

storage/callback: fix the rpm build

Browse Source
This commit is contained in:
3hhh 2020-06-30 14:43:55 +02:00
parent eee800366d
commit 170e5f5d7a
No known key found for this signature in database
GPG Key ID: EB03A691DB2F0833
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -117,11 +117,13 @@ DATADIR ?= /var/lib/qubes
STATEDIR ?= /var/run/qubes STATEDIR ?= /var/run/qubes
LOGDIR ?= /var/log/qubes LOGDIR ?= /var/log/qubes
FILESDIR ?= /usr/share/qubes FILESDIR ?= /usr/share/qubes
DOCDIR ?= /usr/share/doc/qubes
else ifeq ($(OS),Windows_NT) else ifeq ($(OS),Windows_NT)
DATADIR ?= c:/qubes DATADIR ?= c:/qubes
STATEDIR ?= c:/qubes/state STATEDIR ?= c:/qubes/state
LOGDIR ?= c:/qubes/log LOGDIR ?= c:/qubes/log
FILESDIR ?= c:/program files/Invisible Things Lab/Qubes FILESDIR ?= c:/program files/Invisible Things Lab/Qubes
DOCDIR ?= c:/qubes/doc
endif endif
help: help:
@ -212,6 +214,9 @@ endif
cp -r templates "$(DESTDIR)$(FILESDIR)/templates" cp -r templates "$(DESTDIR)$(FILESDIR)/templates"
rm -f "$(DESTDIR)$(FILESDIR)/templates/README" rm -f "$(DESTDIR)$(FILESDIR)/templates/README"
mkdir -p "$(DESTDIR)$(DOCDIR)"
cp qubes/storage/callback.json.example "$(DESTDIR)$(DOCDIR)/qubes_callback.json.example"
mkdir -p $(DESTDIR)$(DATADIR) mkdir -p $(DESTDIR)$(DATADIR)
mkdir -p $(DESTDIR)$(DATADIR)/vm-templates mkdir -p $(DESTDIR)$(DATADIR)/vm-templates
mkdir -p $(DESTDIR)$(DATADIR)/appvms mkdir -p $(DESTDIR)$(DATADIR)/appvms

0
qubes/storage/qubes_callback.json.example → qubes/storage/callback.json.example
View File

2
qubes/storage/callback.py
View File

@ -31,7 +31,7 @@ class CallbackPool(qubes.storage.Pool):
All configuration for this pool driver must be done in `/etc/qubes_callback.json`. Each configuration ID `conf_id` can be used All configuration for this pool driver must be done in `/etc/qubes_callback.json`. Each configuration ID `conf_id` can be used
to create a callback pool with e.g. `qvm-pool -o conf_id=your_conf_id -a pool_name callback`. to create a callback pool with e.g. `qvm-pool -o conf_id=your_conf_id -a pool_name callback`.
Check the `qubes_callback.json.example` for an overview of the available options. Check `/usr/share/doc/qubes/qubes_callback.json.example` for an overview of the available options.
Example applications of this driver: Example applications of this driver:
- custom pool mounts - custom pool mounts

2
rpm_spec/core-dom0.spec.in
View File

@ -402,7 +402,7 @@ done
%{python3_sitelib}/qubes/storage/kernels.py %{python3_sitelib}/qubes/storage/kernels.py
%{python3_sitelib}/qubes/storage/lvm.py %{python3_sitelib}/qubes/storage/lvm.py
%{python3_sitelib}/qubes/storage/callback.py %{python3_sitelib}/qubes/storage/callback.py
%{python3_sitelib}/qubes/storage/qubes_callback.json.example %doc /usr/share/doc/qubes/qubes_callback.json.example
%dir %{python3_sitelib}/qubes/tools %dir %{python3_sitelib}/qubes/tools
%dir %{python3_sitelib}/qubes/tools/__pycache__ %dir %{python3_sitelib}/qubes/tools/__pycache__