diff --git a/misc/block_add_change b/dom0/aux-tools/block_add_change similarity index 100% rename from misc/block_add_change rename to dom0/aux-tools/block_add_change diff --git a/misc/block_cleanup b/dom0/aux-tools/block_cleanup similarity index 100% rename from misc/block_cleanup rename to dom0/aux-tools/block_cleanup diff --git a/misc/block_remove b/dom0/aux-tools/block_remove similarity index 100% rename from misc/block_remove rename to dom0/aux-tools/block_remove diff --git a/misc/usb_add_change b/dom0/aux-tools/usb_add_change similarity index 100% rename from misc/usb_add_change rename to dom0/aux-tools/usb_add_change diff --git a/misc/usb_remove b/dom0/aux-tools/usb_remove similarity index 100% rename from misc/usb_remove rename to dom0/aux-tools/usb_remove diff --git a/misc/vusb-ctl.py b/dom0/aux-tools/vusb-ctl.py similarity index 100% rename from misc/vusb-ctl.py rename to dom0/aux-tools/vusb-ctl.py diff --git a/misc/xl-qvm-usb-attach.py b/dom0/aux-tools/xl-qvm-usb-attach.py similarity index 100% rename from misc/xl-qvm-usb-attach.py rename to dom0/aux-tools/xl-qvm-usb-attach.py diff --git a/misc/xl-qvm-usb-detach.py b/dom0/aux-tools/xl-qvm-usb-detach.py similarity index 100% rename from misc/xl-qvm-usb-detach.py rename to dom0/aux-tools/xl-qvm-usb-detach.py diff --git a/dom0/qmemman/.gitignore b/dom0/qmemman/.gitignore new file mode 100644 index 00000000..4698e0a1 --- /dev/null +++ b/dom0/qmemman/.gitignore @@ -0,0 +1,2 @@ +meminfo-writer +*.o diff --git a/dom0/qmemman/Makefile b/dom0/qmemman/Makefile index a315eb6f..820f42fe 100644 --- a/dom0/qmemman/Makefile +++ b/dom0/qmemman/Makefile @@ -1,5 +1,7 @@ -all: - @echo "Nothing to do here." +all: meminfo-writer + +meminfo-writer: meminfo-writer.o + $(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore clean: rm -f *.pyo diff --git a/misc/meminfo-writer.c b/dom0/qmemman/meminfo-writer.c similarity index 100% rename from misc/meminfo-writer.c rename to dom0/qmemman/meminfo-writer.c diff --git a/qubes_rpc/qubes.Filecopy.policy b/dom0/qubes_rpc/qubes.Filecopy.policy similarity index 100% rename from qubes_rpc/qubes.Filecopy.policy rename to dom0/qubes_rpc/qubes.Filecopy.policy diff --git a/qubes_rpc/qubes.OpenInVM.policy b/dom0/qubes_rpc/qubes.OpenInVM.policy similarity index 100% rename from qubes_rpc/qubes.OpenInVM.policy rename to dom0/qubes_rpc/qubes.OpenInVM.policy diff --git a/qubes_rpc/qubes.VMShell.policy b/dom0/qubes_rpc/qubes.VMShell.policy similarity index 100% rename from qubes_rpc/qubes.VMShell.policy rename to dom0/qubes_rpc/qubes.VMShell.policy diff --git a/misc/block-snapshot b/dom0/system-config/block-snapshot similarity index 100% rename from misc/block-snapshot rename to dom0/system-config/block-snapshot diff --git a/network/ip6tables b/dom0/system-config/ip6tables similarity index 100% rename from network/ip6tables rename to dom0/system-config/ip6tables diff --git a/network/iptables b/dom0/system-config/iptables similarity index 100% rename from network/iptables rename to dom0/system-config/iptables diff --git a/misc/polkit-1-qubes-allow-all.rules b/dom0/system-config/polkit-1-qubes-allow-all.rules similarity index 100% rename from misc/polkit-1-qubes-allow-all.rules rename to dom0/system-config/polkit-1-qubes-allow-all.rules diff --git a/misc/qubes_block.rules b/dom0/system-config/qubes_block.rules similarity index 100% rename from misc/qubes_block.rules rename to dom0/system-config/qubes_block.rules diff --git a/misc/qubes_usb.rules b/dom0/system-config/qubes_usb.rules similarity index 100% rename from misc/qubes_usb.rules rename to dom0/system-config/qubes_usb.rules diff --git a/network/vif-route-qubes b/dom0/system-config/vif-route-qubes similarity index 100% rename from network/vif-route-qubes rename to dom0/system-config/vif-route-qubes diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 8a17f926..f1d3a7a3 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -116,13 +116,13 @@ cp clipboard_notifier/qclipd $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/etc/xen/scripts cp restore/block.qubes $RPM_BUILD_ROOT/etc/xen/scripts -cp ../network/vif-route-qubes $RPM_BUILD_ROOT/etc/xen/scripts -cp ../misc/block-snapshot $RPM_BUILD_ROOT/etc/xen/scripts +cp system-config/vif-route-qubes $RPM_BUILD_ROOT/etc/xen/scripts +cp system-config/block-snapshot $RPM_BUILD_ROOT/etc/xen/scripts ln -s block-snapshot $RPM_BUILD_ROOT/etc/xen/scripts/block-origin mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d -cp ../misc/qubes_block.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_block.rules -cp ../misc/qubes_usb.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_usb.rules +cp system-config/qubes_block.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_block.rules +cp system-config/qubes_usb.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_usb.rules mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/qubes cp qvm-core/qubes.py $RPM_BUILD_ROOT%{python_sitearch}/qubes @@ -151,7 +151,7 @@ cp aux-tools/startup-dvm.sh $RPM_BUILD_ROOT/usr/lib/qubes cp aux-tools/startup-misc.sh $RPM_BUILD_ROOT/usr/lib/qubes cp aux-tools/prepare_volatile_img.sh $RPM_BUILD_ROOT/usr/lib/qubes cp qmemman/server.py $RPM_BUILD_ROOT/usr/lib/qubes/qmemman_daemon.py -cp ../misc/meminfo-writer $RPM_BUILD_ROOT/usr/lib/qubes/ +cp qmemman/meminfo-writer $RPM_BUILD_ROOT/usr/lib/qubes/ cp ../qrexec/qrexec_daemon $RPM_BUILD_ROOT/usr/lib/qubes/ cp ../qrexec/qrexec_client $RPM_BUILD_ROOT/usr/lib/qubes/ cp ../qrexec/qrexec_policy $RPM_BUILD_ROOT/usr/lib/qubes/ @@ -159,21 +159,21 @@ cp qubes_rpc/qfile-dom0-unpacker $RPM_BUILD_ROOT/usr/lib/qubes/ cp qubes_rpc/qubes-notify-updates $RPM_BUILD_ROOT/usr/lib/qubes/ cp qubes_rpc/qubes-receive-appmenus $RPM_BUILD_ROOT/usr/lib/qubes/ cp qubes_rpc/qubes-receive-updates $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/block_add_change $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/block_remove $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/block_cleanup $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/usb_add_change $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/usb_remove $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/vusb-ctl.py $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/xl-qvm-usb-attach.py $RPM_BUILD_ROOT/usr/lib/qubes/ -cp ../misc/xl-qvm-usb-detach.py $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/block_add_change $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/block_remove $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/block_cleanup $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/usb_add_change $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/usb_remove $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/vusb-ctl.py $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/xl-qvm-usb-attach.py $RPM_BUILD_ROOT/usr/lib/qubes/ +cp aux-tools/xl-qvm-usb-detach.py $RPM_BUILD_ROOT/usr/lib/qubes/ cp aux-tools/block_cleaner_daemon.py $RPM_BUILD_ROOT/usr/lib/qubes/ cp aux-tools/fix_dir_perms.sh $RPM_BUILD_ROOT/usr/lib/qubes/ mkdir -p $RPM_BUILD_ROOT/etc/qubes_rpc/policy -cp ../qubes_rpc/qubes.Filecopy.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.Filecopy -cp ../qubes_rpc/qubes.OpenInVM.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.OpenInVM -cp ../qubes_rpc/qubes.VMShell.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.VMShell +cp qubes_rpc/qubes.Filecopy.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.Filecopy +cp qubes_rpc/qubes.OpenInVM.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.OpenInVM +cp qubes_rpc/qubes.VMShell.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.VMShell cp qubes_rpc/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.SyncAppMenus cp qubes_rpc/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes_rpc/ cp ../qrexec/qubes_rpc_multiplexer $RPM_BUILD_ROOT/usr/lib/qubes @@ -230,8 +230,8 @@ ln -s /usr/lib/qubes/qubes_setup_dnat_to_ns $RPM_BUILD_ROOT/etc/dhclient.d/qubes mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/ cp ../network/qubes_nmhook $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -cp ../network/iptables $RPM_BUILD_ROOT/etc/sysconfig -cp ../network/ip6tables $RPM_BUILD_ROOT/etc/sysconfig +cp system-config/iptables $RPM_BUILD_ROOT/etc/sysconfig +cp system-config/ip6tables $RPM_BUILD_ROOT/etc/sysconfig mkdir -p $RPM_BUILD_ROOT/etc/security/limits.d cp misc/limits-qubes.conf $RPM_BUILD_ROOT/etc/security/limits.d/99-qubes.conf @@ -246,7 +246,7 @@ mkdir -p $RPM_BUILD_ROOT/var/run/qubes install -d $RPM_BUILD_ROOT/etc/sudoers.d install -m 0440 qubes.sudoers $RPM_BUILD_ROOT/etc/sudoers.d/qubes -install -D ../misc/polkit-1-qubes-allow-all.rules $RPM_BUILD_ROOT/etc/polkit-1/rules.d/00-qubes-allow-all.rules +install -D system-config/polkit-1-qubes-allow-all.rules $RPM_BUILD_ROOT/etc/polkit-1/rules.d/00-qubes-allow-all.rules install -d $RPM_BUILD_ROOT/etc/xdg/autostart install -m 0644 qubes-guid.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/