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

Rename vm-configs directory to be more generic

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-08-02 20:27:33 +02:00
parent 35ecfc82ef
commit ec37a4e681
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -10,10 +10,12 @@ ifeq ($(OS),Linux)
DATADIR ?= /var/lib/qubes DATADIR ?= /var/lib/qubes
STATEDIR ?= /var/run/qubes STATEDIR ?= /var/run/qubes
LOGDIR ?= /var/log/qubes LOGDIR ?= /var/log/qubes
FILESDIR ?= /usr/share/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
endif endif
help: help:
@ -78,11 +80,9 @@ endif
cp qubes-rpc/qubes.NotifyTools $(DESTDIR)/etc/qubes-rpc/ cp qubes-rpc/qubes.NotifyTools $(DESTDIR)/etc/qubes-rpc/
cp qubes-rpc/qubes-notify-updates $(DESTDIR)/usr/libexec/qubes/ cp qubes-rpc/qubes-notify-updates $(DESTDIR)/usr/libexec/qubes/
cp qubes-rpc/qubes-notify-tools $(DESTDIR)/usr/libexec/qubes/ cp qubes-rpc/qubes-notify-tools $(DESTDIR)/usr/libexec/qubes/
mkdir -p $(DESTDIR)/usr/share/qubes mkdir -p "$(DESTDIR)$(FILESDIR)"
ifeq ($(BACKEND_VMM),xen) cp vm-config/$(BACKEND_VMM)-vm-template.xml "$(DESTDIR)$(FILESDIR)/vm-template.xml"
cp xen-vm-config/vm-template.xml $(DESTDIR)/usr/share/qubes/xen-vm-template.xml cp vm-config/$(BACKEND_VMM)-vm-template-hvm.xml "$(DESTDIR)$(FILESDIR)/vm-template-hvm.xml"
cp xen-vm-config/vm-template-hvm.xml $(DESTDIR)/usr/share/qubes/
endif
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

2
core/qubes.py
View File

@ -68,7 +68,7 @@ system_path = {
# use QIcon.fromTheme() where applicable # use QIcon.fromTheme() where applicable
'qubes_icon_dir': '/usr/share/icons/hicolor/128x128/devices', 'qubes_icon_dir': '/usr/share/icons/hicolor/128x128/devices',
'config_template_pv': '/usr/share/qubes/xen-vm-template.xml', 'config_template_pv': '/usr/share/qubes/vm-template.xml',
'qubes_pciback_cmd': '/usr/lib/qubes/unbind-pci-device.sh', 'qubes_pciback_cmd': '/usr/lib/qubes/unbind-pci-device.sh',
'prepare_volatile_img_cmd': '/usr/lib/qubes/prepare-volatile-img.sh', 'prepare_volatile_img_cmd': '/usr/lib/qubes/prepare-volatile-img.sh',

0
xen-vm-config/vm-template-hvm.xml → vm-config/xen-vm-template-hvm.xml
View File

0
xen-vm-config/vm-template.xml → vm-config/xen-vm-template.xml
View File