diff --git a/Makefile b/Makefile index 8e4d77af..a604e4fe 100644 --- a/Makefile +++ b/Makefile @@ -117,11 +117,13 @@ DATADIR ?= /var/lib/qubes STATEDIR ?= /var/run/qubes LOGDIR ?= /var/log/qubes FILESDIR ?= /usr/share/qubes +DOCDIR ?= /usr/share/doc/qubes else ifeq ($(OS),Windows_NT) DATADIR ?= c:/qubes STATEDIR ?= c:/qubes/state LOGDIR ?= c:/qubes/log FILESDIR ?= c:/program files/Invisible Things Lab/Qubes +DOCDIR ?= c:/qubes/doc endif help: @@ -212,6 +214,9 @@ endif cp -r templates "$(DESTDIR)$(FILESDIR)/templates" 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)/vm-templates mkdir -p $(DESTDIR)$(DATADIR)/appvms diff --git a/qubes/storage/qubes_callback.json.example b/qubes/storage/callback.json.example similarity index 100% rename from qubes/storage/qubes_callback.json.example rename to qubes/storage/callback.json.example diff --git a/qubes/storage/callback.py b/qubes/storage/callback.py index 07938235..b51b6cb3 100644 --- a/qubes/storage/callback.py +++ b/qubes/storage/callback.py @@ -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 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: - custom pool mounts diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index 4b238b18..19e27a40 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -402,7 +402,7 @@ done %{python3_sitelib}/qubes/storage/kernels.py %{python3_sitelib}/qubes/storage/lvm.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/__pycache__