From 4de377bc3b41bf740300d20cb6e4ecd0b69b916d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?= Date: Sun, 20 Oct 2019 23:57:19 +0100 Subject: [PATCH] Split items in `misc` directory by topic --- Makefile | 106 +----------------- ...ktop.wm.preferences.qubes.gschema.override | 0 ..._org.gnome.nautilus.qubes.gschema.override | 0 ...mon.plugins.updates.qubes.gschema.override | 0 ....NotificationDaemon.qubes.gschema.override | 0 app-defaults/Makefile | 11 ++ app-menu/Makefile | 19 ++++ {misc => app-menu}/qubes-desktop-run | 0 {misc => app-menu}/qubes-run-gnome-terminal | 0 {misc => app-menu}/qubes-run-terminal | 0 {misc => app-menu}/qubes-run-terminal.desktop | 0 {misc => app-menu}/qubes-session-autostart | 0 .../qubes-trigger-sync-appmenus.sh | 0 archlinux/PKGBUILD.install | 2 +- boot/Makefile | 10 ++ {misc => boot}/dracut-qubes.conf | 0 {misc => boot}/grub.qubes | 0 boot/redhat/Makefile | 12 ++ {misc => boot/redhat}/qubes-serial-login | 0 {misc => boot/redhat}/serial.conf | 0 .../redhat}/session-stop-timeout.conf | 0 debian/qubes-core-agent.install | 2 +- debian/rules | 11 ++ {misc => filesystem}/30_cron.conf | 0 filesystem/Makefile | 15 +++ {misc => filesystem}/fstab | 0 misc/.gitignore | 2 +- ...-misc.rules => 50-qubes-mem-hotplug.rules} | 0 misc/Makefile | 38 ++++--- misc/{marker-vm => marker-vm.in} | 0 network/Makefile | 18 +++ {misc => network}/qvm-connect-tcp | 0 {misc => network}/tinyproxy-wrapper | 0 package-managers/Makefile | 55 +++++++++ .../RPM-GPG-KEY-qubes-4-centos | 0 .../RPM-GPG-KEY-qubes-4-primary | 0 .../RPM-GPG-KEY-qubes-4-unstable | 0 .../apt-conf-00notify-hook | 0 .../apt-conf-70no-unattended | 0 .../apt-qubes-archive-keyring.gpg | Bin .../apt-qubes-r4.list.in | 0 .../dnf-qubes-hooks.conf | 0 {misc => package-managers}/dnf-qubes-hooks.py | 0 .../qubes-download-dom0-updates.sh | 0 .../upgrades-installed-check | 0 .../upgrades-status-notify | 0 .../yum-qubes-hooks.conf | 0 {misc => package-managers}/yum-qubes-hooks.py | 0 .../yum-qubes-r4.repo.in | 0 passwordless-root/Makefile | 12 ++ passwordless-root/debian/Makefile | 7 ++ .../debian}/pam.d_su.qubes | 0 .../polkit-1-qubes-allow-all.pkla | 0 .../polkit-1-qubes-allow-all.rules | 0 {misc => passwordless-root}/qubes.sudoers | 0 ...k-instead-of-parted-to-resize-root-p.patch | 8 +- patches.debian/01_add_anacron.patch | 4 +- qubes-rpc/Makefile | 2 +- {misc => qubes-rpc}/resize-rootfs | 0 rpm_spec/core-agent.spec.in | 22 +++- {misc => sys-defaults}/20_tcp_timestamps.conf | 0 sys-defaults/Makefile | 12 ++ {misc => sys-defaults}/dconf-db-local-dpi | 0 .../profile.d_qt_x11_no_mitshm.sh | 0 .../sudoers.d_qt_x11_no_mitshm | 0 {misc => sys-defaults}/sudoers.d_umask | 0 66 files changed, 236 insertions(+), 132 deletions(-) rename {misc => app-defaults}/20_org.gnome.desktop.wm.preferences.qubes.gschema.override (100%) rename {misc => app-defaults}/20_org.gnome.nautilus.qubes.gschema.override (100%) rename {misc => app-defaults}/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override (100%) rename {misc => app-defaults}/20_org.mate.NotificationDaemon.qubes.gschema.override (100%) create mode 100644 app-defaults/Makefile create mode 100644 app-menu/Makefile rename {misc => app-menu}/qubes-desktop-run (100%) rename {misc => app-menu}/qubes-run-gnome-terminal (100%) rename {misc => app-menu}/qubes-run-terminal (100%) rename {misc => app-menu}/qubes-run-terminal.desktop (100%) rename {misc => app-menu}/qubes-session-autostart (100%) rename {misc => app-menu}/qubes-trigger-sync-appmenus.sh (100%) create mode 100644 boot/Makefile rename {misc => boot}/dracut-qubes.conf (100%) rename {misc => boot}/grub.qubes (100%) create mode 100644 boot/redhat/Makefile rename {misc => boot/redhat}/qubes-serial-login (100%) rename {misc => boot/redhat}/serial.conf (100%) rename {misc => boot/redhat}/session-stop-timeout.conf (100%) rename {misc => filesystem}/30_cron.conf (100%) create mode 100644 filesystem/Makefile rename {misc => filesystem}/fstab (100%) rename misc/{udev-qubes-misc.rules => 50-qubes-mem-hotplug.rules} (100%) rename misc/{marker-vm => marker-vm.in} (100%) create mode 100644 network/Makefile rename {misc => network}/qvm-connect-tcp (100%) rename {misc => network}/tinyproxy-wrapper (100%) create mode 100644 package-managers/Makefile rename {misc => package-managers}/RPM-GPG-KEY-qubes-4-centos (100%) rename {misc => package-managers}/RPM-GPG-KEY-qubes-4-primary (100%) rename {misc => package-managers}/RPM-GPG-KEY-qubes-4-unstable (100%) rename network/00notify-hook => package-managers/apt-conf-00notify-hook (100%) rename {misc => package-managers}/apt-conf-70no-unattended (100%) rename misc/qubes-archive-keyring.gpg => package-managers/apt-qubes-archive-keyring.gpg (100%) rename misc/qubes-r4.list.in => package-managers/apt-qubes-r4.list.in (100%) rename {misc => package-managers}/dnf-qubes-hooks.conf (100%) rename {misc => package-managers}/dnf-qubes-hooks.py (100%) rename {misc => package-managers}/qubes-download-dom0-updates.sh (100%) rename {misc => package-managers}/upgrades-installed-check (100%) rename {misc => package-managers}/upgrades-status-notify (100%) rename {misc => package-managers}/yum-qubes-hooks.conf (100%) rename {misc => package-managers}/yum-qubes-hooks.py (100%) rename misc/qubes-r4.repo.in => package-managers/yum-qubes-r4.repo.in (100%) create mode 100644 passwordless-root/Makefile create mode 100644 passwordless-root/debian/Makefile rename {misc => passwordless-root/debian}/pam.d_su.qubes (100%) rename {misc => passwordless-root}/polkit-1-qubes-allow-all.pkla (100%) rename {misc => passwordless-root}/polkit-1-qubes-allow-all.rules (100%) rename {misc => passwordless-root}/qubes.sudoers (100%) rename {misc => qubes-rpc}/resize-rootfs (100%) rename {misc => sys-defaults}/20_tcp_timestamps.conf (100%) create mode 100644 sys-defaults/Makefile rename {misc => sys-defaults}/dconf-db-local-dpi (100%) rename {misc => sys-defaults}/profile.d_qt_x11_no_mitshm.sh (100%) rename {misc => sys-defaults}/sudoers.d_qt_x11_no_mitshm (100%) rename {misc => sys-defaults}/sudoers.d_umask (100%) diff --git a/Makefile b/Makefile index a3dd918..b0e50f5 100644 --- a/Makefile +++ b/Makefile @@ -2,17 +2,12 @@ RPMS_DIR=rpm/ VERSION := $(shell cat version) -DIST ?= fc18 -APPLICATIONSDIR ?= /usr/share/applications SBINDIR ?= /usr/sbin BINDIR ?= /usr/bin LIBDIR ?= /usr/lib SYSLIBDIR ?= /lib PYTHON ?= /usr/bin/python3 -PYTHON_SITEARCH = $(shell python2 -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1)') -PYTHON2_SITELIB = $(shell python2 -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') -PYTHON3_SITELIB = $(shell python3 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') # This makefile uses some bash-isms, make uses /bin/sh by default. SHELL = /bin/bash @@ -52,8 +47,8 @@ clean: rm -f .coverage all: - make -C misc - make -C qubes-rpc + $(MAKE) -C misc VERSION=$(VERSION) + $(MAKE) -C qubes-rpc # Dropin Directory SYSTEM_DROPIN_DIR ?= "lib/systemd/system" @@ -156,30 +151,6 @@ install-sysvinit: install-init install network/qubes-iptables $(DESTDIR)/etc/init.d/ install-rh: install-systemd install-systemd-dropins install-sysvinit - install -D -m 0644 misc/qubes-r4.repo.in $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo - DIST='$(DIST)'; sed -i "s/@DIST@/$${DIST%%[0-9]*}/g" $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo - install -d $(DESTDIR)$(LIBDIR)/yum-plugins/ - install -d -m 755 $(DESTDIR)/etc/pki/rpm-gpg - install -m 644 misc/RPM-GPG-KEY-qubes* $(DESTDIR)/etc/pki/rpm-gpg/ - install -D -m 644 misc/session-stop-timeout.conf $(DESTDIR)$(LIBDIR)/systemd/system/user@.service.d/90-session-stop-timeout.conf - - install -d $(DESTDIR)/etc/yum.conf.d - touch $(DESTDIR)/etc/yum.conf.d/qubes-proxy.conf - - install -D -m 0644 misc/grub.qubes $(DESTDIR)/etc/default/grub.qubes - install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/share/qubes/serial.conf - install -D misc/qubes-serial-login $(DESTDIR)/$(SBINDIR)/qubes-serial-login - install -D -m 0644 misc/dracut-qubes.conf \ - $(DESTDIR)/usr/lib/dracut/dracut.conf.d/30-qubes.conf -ifeq ($(shell rpm --eval %{centos_ver}),7) - install -D -m 0644 misc/yum-qubes-hooks.py $(DESTDIR)$(LIBDIR)/yum-plugins/ - install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf -endif - install -D -m 0644 misc/dnf-qubes-hooks.py \ - $(DESTDIR)$(PYTHON2_SITELIB)/dnf-plugins/qubes-hooks.py - install -D -m 0644 misc/dnf-qubes-hooks.py \ - $(DESTDIR)$(PYTHON3_SITELIB)/dnf-plugins/qubes-hooks.py - install -D -m 0644 misc/dnf-qubes-hooks.conf $(DESTDIR)/etc/dnf/plugins/qubes-hooks.conf install-doc: $(MAKE) -C doc install @@ -187,71 +158,11 @@ install-doc: install-common: install-doc $(MAKE) -C autostart-dropins install $(MAKE) -C applications-dropins install - install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab # force /usr/bin before /bin to have /usr/bin/python instead of /bin/python PATH="/usr/bin:$(PATH)" $(PYTHON) setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR) mkdir -p $(DESTDIR)$(SBINDIR) - install -d -m 0750 $(DESTDIR)/etc/sudoers.d/ - install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes - install -D -m 0440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm - install -D -m 0644 misc/20_tcp_timestamps.conf $(DESTDIR)/etc/sysctl.d/20_tcp_timestamps.conf - - install -d $(DESTDIR)/var/lib/qubes - - install -d $(DESTDIR)/etc/udev/rules.d - install -m 0644 misc/udev-qubes-misc.rules $(DESTDIR)/etc/udev/rules.d/50-qubes-misc.rules - install -d $(DESTDIR)$(LIBDIR)/qubes/ - install misc/qubes-trigger-sync-appmenus.sh $(DESTDIR)$(LIBDIR)/qubes/ - install -d -m 0750 $(DESTDIR)/etc/polkit-1/rules.d - install -D -m 0644 misc/polkit-1-qubes-allow-all.pkla $(DESTDIR)/etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla - install -D -m 0644 misc/polkit-1-qubes-allow-all.rules $(DESTDIR)/etc/polkit-1/rules.d/00-qubes-allow-all.rules - install -D -m 0644 misc/mime-globs $(DESTDIR)/usr/share/qubes/mime-override/globs - install misc/qubes-download-dom0-updates.sh $(DESTDIR)$(LIBDIR)/qubes/ - install -d $(DESTDIR)/usr/share/glib-2.0/schemas/ - install -m 0644 \ - misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \ - misc/20_org.gnome.nautilus.qubes.gschema.override \ - misc/20_org.mate.NotificationDaemon.qubes.gschema.override \ - misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override \ - $(DESTDIR)/usr/share/glib-2.0/schemas/ - install -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates - install -D -m 0644 misc/qubes-master-key.asc $(DESTDIR)/usr/share/qubes/qubes-master-key.asc - install misc/resize-rootfs $(DESTDIR)$(LIBDIR)/qubes/ - - install misc/upgrades-installed-check $(DESTDIR)$(LIBDIR)/qubes/upgrades-installed-check - install misc/upgrades-status-notify $(DESTDIR)$(LIBDIR)/qubes/upgrades-status-notify - - install -m 0644 network/udev-qubes-network.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-network.rules - install -m 0755 network/update-proxy-configs $(DESTDIR)$(LIBDIR)/qubes/ - - install -d $(DESTDIR)$(BINDIR) - install -m 0755 misc/qubes-session-autostart $(DESTDIR)$(BINDIR)/qubes-session-autostart - install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request - install -m 0755 misc/qubes-run-terminal $(DESTDIR)/$(BINDIR) - install -D -m 0644 misc/qubes-run-terminal.desktop $(DESTDIR)/$(APPLICATIONSDIR)/qubes-run-terminal.desktop - install -m 0755 misc/qubes-run-gnome-terminal $(DESTDIR)/$(BINDIR) - - install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi - - install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run - - install -d $(DESTDIR)/mnt/removable - - install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d - install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf - - install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm - cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm - - install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper - - install -m 0755 misc/qvm-console $(DESTDIR)$(BINDIR)/qvm-console - install -m 0755 misc/qvm-connect-tcp $(DESTDIR)$(BINDIR)/qvm-connect-tcp - - install -d $(DESTDIR)/var/run/qubes - install -d $(DESTDIR)/rw # Networking install target includes: # * basic network functionality (setting IP address, DNS, default gateway) @@ -260,9 +171,6 @@ install-networking: install -d $(DESTDIR)$(SYSLIBDIR)/systemd/system install -m 0644 vm-systemd/qubes-*.socket $(DESTDIR)$(SYSLIBDIR)/systemd/system/ - install -d $(DESTDIR)$(LIBDIR)/qubes/ - install network/setup-ip $(DESTDIR)$(LIBDIR)/qubes/ - # Netvm install target includes: # * qubes-firewall service (FirewallVM) # * DNS redirection setup @@ -318,20 +226,10 @@ install-networkmanager: install -m 0644 network/show-hide-nm-applet.desktop $(DESTDIR)/etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop install-deb: install-common install-systemd install-systemd-dropins install-systemd-networking-dropins install-networking install-networkmanager install-netvm - mkdir -p $(DESTDIR)/etc/apt/sources.list.d - sed -e "s/@DIST@/`lsb_release -cs`/" misc/qubes-r4.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r4.list - install -D -m 644 misc/qubes-archive-keyring.gpg $(DESTDIR)/etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg - install -D -m 644 network/00notify-hook $(DESTDIR)/etc/apt/apt.conf.d/00notify-hook install -d $(DESTDIR)/etc/sysctl.d install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/ - install -D -m 644 misc/profile.d_qt_x11_no_mitshm.sh $(DESTDIR)/etc/profile.d/qt_x11_no_mitshm.sh - install -D -m 440 misc/sudoers.d_umask $(DESTDIR)/etc/sudoers.d/umask - install -d $(DESTDIR)/etc/pam.d - install -m 0644 misc/pam.d_su.qubes $(DESTDIR)/etc/pam.d/su.qubes install -d $(DESTDIR)/etc/needrestart/conf.d install -D -m 0644 misc/50_qubes.conf $(DESTDIR)/etc/needrestart/conf.d/50_qubes.conf - install -D -m 0644 misc/grub.qubes $(DESTDIR)/etc/default/grub.d/30-qubes.cfg - install -D -m 0644 misc/apt-conf-70no-unattended $(DESTDIR)/etc/apt/apt.conf.d/70no-unattended mkdir -p $(DESTDIR)/etc/systemd/system/ install -m 0644 vm-systemd/haveged.service $(DESTDIR)/etc/systemd/system/ diff --git a/misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override b/app-defaults/20_org.gnome.desktop.wm.preferences.qubes.gschema.override similarity index 100% rename from misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override rename to app-defaults/20_org.gnome.desktop.wm.preferences.qubes.gschema.override diff --git a/misc/20_org.gnome.nautilus.qubes.gschema.override b/app-defaults/20_org.gnome.nautilus.qubes.gschema.override similarity index 100% rename from misc/20_org.gnome.nautilus.qubes.gschema.override rename to app-defaults/20_org.gnome.nautilus.qubes.gschema.override diff --git a/misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override b/app-defaults/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override similarity index 100% rename from misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override rename to app-defaults/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override diff --git a/misc/20_org.mate.NotificationDaemon.qubes.gschema.override b/app-defaults/20_org.mate.NotificationDaemon.qubes.gschema.override similarity index 100% rename from misc/20_org.mate.NotificationDaemon.qubes.gschema.override rename to app-defaults/20_org.mate.NotificationDaemon.qubes.gschema.override diff --git a/app-defaults/Makefile b/app-defaults/Makefile new file mode 100644 index 0000000..35e2d9d --- /dev/null +++ b/app-defaults/Makefile @@ -0,0 +1,11 @@ +GLIBSCHEMAS ?= /usr/share/glib-2.0/schemas + +.PHONY: install + +install: + install -d $(DESTDIR)$(GLIBSCHEMAS) + install -t $(DESTDIR)$(GLIBSCHEMAS) -m 0644 \ + 20_org.gnome.desktop.wm.preferences.qubes.gschema.override \ + 20_org.gnome.nautilus.qubes.gschema.override \ + 20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \ + 20_org.mate.NotificationDaemon.qubes.gschema.override diff --git a/app-menu/Makefile b/app-menu/Makefile new file mode 100644 index 0000000..28cac41 --- /dev/null +++ b/app-menu/Makefile @@ -0,0 +1,19 @@ +APPLICATIONSDIR ?= /usr/share/applications +BINDIR ?= /usr/bin +LIBDIR ?= /usr/lib +QUBESLIBDIR = $(LIBDIR)/qubes + +.PHONY: install + +install: + install -d $(DESTDIR)$(QUBESLIBDIR) + install -t $(DESTDIR)$(QUBESLIBDIR) \ + qubes-trigger-sync-appmenus.sh + install -d $(DESTDIR)$(BINDIR) + install -t $(DESTDIR)$(BINDIR) \ + qubes-desktop-run \ + qubes-run-gnome-terminal \ + qubes-run-terminal \ + qubes-session-autostart + install -d $(DESTDIR)/$(APPLICATIONSDIR) + install -t $(DESTDIR)/$(APPLICATIONSDIR) -m 0644 qubes-run-terminal.desktop diff --git a/misc/qubes-desktop-run b/app-menu/qubes-desktop-run similarity index 100% rename from misc/qubes-desktop-run rename to app-menu/qubes-desktop-run diff --git a/misc/qubes-run-gnome-terminal b/app-menu/qubes-run-gnome-terminal similarity index 100% rename from misc/qubes-run-gnome-terminal rename to app-menu/qubes-run-gnome-terminal diff --git a/misc/qubes-run-terminal b/app-menu/qubes-run-terminal similarity index 100% rename from misc/qubes-run-terminal rename to app-menu/qubes-run-terminal diff --git a/misc/qubes-run-terminal.desktop b/app-menu/qubes-run-terminal.desktop similarity index 100% rename from misc/qubes-run-terminal.desktop rename to app-menu/qubes-run-terminal.desktop diff --git a/misc/qubes-session-autostart b/app-menu/qubes-session-autostart similarity index 100% rename from misc/qubes-session-autostart rename to app-menu/qubes-session-autostart diff --git a/misc/qubes-trigger-sync-appmenus.sh b/app-menu/qubes-trigger-sync-appmenus.sh similarity index 100% rename from misc/qubes-trigger-sync-appmenus.sh rename to app-menu/qubes-trigger-sync-appmenus.sh diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index bb6baf5..d4f3030 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -355,7 +355,7 @@ post_install() { continue fi - if [ "$(basename "$f")" == "50-qubes-misc.rules" ] ; then + if [ "$(basename "$f")" == "50-qubes-mem-hotplug.rules" ] ; then continue fi diff --git a/boot/Makefile b/boot/Makefile new file mode 100644 index 0000000..7cb97ff --- /dev/null +++ b/boot/Makefile @@ -0,0 +1,10 @@ +LIBDIR ?= /usr/lib +SYSCONFDIR ?= /etc +GRUBCONFDIR ?= $(SYSCONFDIR)/grub.d +DRACUTCONFDIR ?= $(LIBDIR)/dracut/dracut.conf.d + +.PHONY: install + +install: + install -D -m 0644 grub.qubes $(DESTDIR)$(GRUBCONFDIR)/30_qubes + install -D -m 0644 dracut-qubes.conf $(DESTDIR)$(DRACUTCONFDIR)/30-qubes.conf diff --git a/misc/dracut-qubes.conf b/boot/dracut-qubes.conf similarity index 100% rename from misc/dracut-qubes.conf rename to boot/dracut-qubes.conf diff --git a/misc/grub.qubes b/boot/grub.qubes similarity index 100% rename from misc/grub.qubes rename to boot/grub.qubes diff --git a/boot/redhat/Makefile b/boot/redhat/Makefile new file mode 100644 index 0000000..c4f6417 --- /dev/null +++ b/boot/redhat/Makefile @@ -0,0 +1,12 @@ +LIBDIR ?= /usr/lib +SBINDIR ?= /usr/sbin +SYSCONFDIR ?= /etc +QUBESDATADIR = /usr/share/qubes + +.PHONY: install + +install: + install -D -m 0644 session-stop-timeout.conf \ + $(DESTDIR)$(LIBDIR)/systemd/system/user@.service.d/90-session-stop-timeout.conf + install -D -m 0644 serial.conf $(DESTDIR)$(QUBESDATADIR)/serial.conf + install -D qubes-serial-login $(DESTDIR)$(SBINDIR)/qubes-serial-login diff --git a/misc/qubes-serial-login b/boot/redhat/qubes-serial-login similarity index 100% rename from misc/qubes-serial-login rename to boot/redhat/qubes-serial-login diff --git a/misc/serial.conf b/boot/redhat/serial.conf similarity index 100% rename from misc/serial.conf rename to boot/redhat/serial.conf diff --git a/misc/session-stop-timeout.conf b/boot/redhat/session-stop-timeout.conf similarity index 100% rename from misc/session-stop-timeout.conf rename to boot/redhat/session-stop-timeout.conf diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index a979139..8a887c7 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -55,7 +55,7 @@ etc/sudoers.d/umask etc/sysctl.d/20_tcp_timestamps.conf etc/sysctl.d/80-qubes.conf etc/systemd/system/haveged.service -etc/udev/rules.d/50-qubes-misc.rules +etc/udev/rules.d/50-qubes-mem-hotplug.rules lib/modules-load.d/qubes-core.conf lib/systemd/system-preset/75-qubes-vm.preset lib/systemd/system/boot.automount.d/30_qubes.conf diff --git a/debian/rules b/debian/rules index fb94d24..c3262ac 100755 --- a/debian/rules +++ b/debian/rules @@ -16,10 +16,21 @@ override_dh_auto_build: override_dh_auto_install: make install-deb + make -C app-defaults install + make -C app-menu install + make -C filesystem install + make -C misc install + make -C network install + make -C package-managers install + make -C package-managers install-apt + make -C passwordless-root install + make -C passwordless-root/debian install + make -C sys-defaults install make -C qubes-rpc install make -C qubes-rpc/kde install make -C qubes-rpc/nautilus install make -C qubes-rpc/thunar install + install -D -m 0644 boot/grub.qubes $(DESTDIR)/etc/default/grub.d/30-qubes.cfg override_dh_fixperms: dh_fixperms -a -Xqfile-unpacker diff --git a/misc/30_cron.conf b/filesystem/30_cron.conf similarity index 100% rename from misc/30_cron.conf rename to filesystem/30_cron.conf diff --git a/filesystem/Makefile b/filesystem/Makefile new file mode 100644 index 0000000..f3f2079 --- /dev/null +++ b/filesystem/Makefile @@ -0,0 +1,15 @@ +LIBDIR ?= /usr/lib +STATEDIR ?= /var/lib +SYSCONFDIR ?= /etc +QUBESBINDSDIR = $(LIBDIR)/qubes-bind-dirs.d +QUBESSTATEDIR = $(STATEDIR)/qubes + +.PHONY: install + +install: + install -D -m 0644 fstab $(DESTDIR)$(SYSCONFDIR)/fstab + install -d $(DESTDIR)$(QUBESBINDSDIR) + install -t $(DESTDIR)$(QUBESBINDSDIR) -m 0644 30_cron.conf + install -d $(DESTDIR)$(QUBESSTATEDIR) + install -d $(DESTDIR)/mnt/removable + install -d $(DESTDIR)/rw diff --git a/misc/fstab b/filesystem/fstab similarity index 100% rename from misc/fstab rename to filesystem/fstab diff --git a/misc/.gitignore b/misc/.gitignore index 03034a9..001cb70 100644 --- a/misc/.gitignore +++ b/misc/.gitignore @@ -1 +1 @@ -meminfo-writer +/marker-vm diff --git a/misc/udev-qubes-misc.rules b/misc/50-qubes-mem-hotplug.rules similarity index 100% rename from misc/udev-qubes-misc.rules rename to misc/50-qubes-mem-hotplug.rules diff --git a/misc/Makefile b/misc/Makefile index f67a0be..aeb7d5b 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,19 +1,25 @@ -all: python -python: python2 python3 -python2: - rm -rf py2 - mkdir -p py2 - cp *.py py2/ - python2 -m compileall py2 - python2 -O -m compileall py2 +BINDIR ?= /usr/bin +SYSCONFDIR ?= /etc +UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d +QUBESDATADIR = /usr/share/qubes -# Only some scripts does support python3 for now -python3: - rm -rf py3 - mkdir -p py3 - cp dnf-qubes-hooks.py py3/ - python3 -m compileall py3 - python3 -O -m compileall py3 +.PHONY: all clean install + +all: marker-vm clean: - rm -f *~ *.pyc *.pyo + -$(RM) marker-vm + +install: + install -d $(DESTDIR)$(UDEVRULESDIR) + install -t $(DESTDIR)$(UDEVRULESDIR) -m 0644 50-qubes-mem-hotplug.rules + install -d $(DESTDIR)$(QUBESDATADIR) + install -D -t $(DESTDIR)$(QUBESDATADIR) -m 0644 \ + marker-vm \ + qubes-master-key.asc + install -D -m 0644 mime-globs $(DESTDIR)$(QUBESDATADIR)/mime-override/globs + install -d $(DESTDIR)$(BINDIR) + install -t $(DESTDIR)$(BINDIR) qvm-features-request + +marker-vm: marker-vm.in + printf "$(VERSION)" | cut -f 1,2 -d . | cat $< - > marker-vm diff --git a/misc/marker-vm b/misc/marker-vm.in similarity index 100% rename from misc/marker-vm rename to misc/marker-vm.in diff --git a/network/Makefile b/network/Makefile new file mode 100644 index 0000000..30d9eb2 --- /dev/null +++ b/network/Makefile @@ -0,0 +1,18 @@ +BINDIR ?= /usr/bin +LIBDIR ?= /usr/lib +SYSCONFDIR ?= /etc +QUBESLIBDIR = $(LIBDIR)/qubes +UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d + +.PHONY: install + +install: + install -D -m 0644 udev-qubes-network.rules $(DESTDIR)$(UDEVRULESDIR)/99-qubes-network.rules + install -d $(DESTDIR)$(QUBESLIBDIR) + install -t $(DESTDIR)$(QUBESLIBDIR) \ + setup-ip \ + tinyproxy-wrapper \ + update-proxy-configs + install -d $(DESTDIR)$(BINDIR) + install -t $(DESTDIR)$(BINDIR) \ + qvm-connect-tcp diff --git a/misc/qvm-connect-tcp b/network/qvm-connect-tcp similarity index 100% rename from misc/qvm-connect-tcp rename to network/qvm-connect-tcp diff --git a/misc/tinyproxy-wrapper b/network/tinyproxy-wrapper similarity index 100% rename from misc/tinyproxy-wrapper rename to network/tinyproxy-wrapper diff --git a/package-managers/Makefile b/package-managers/Makefile new file mode 100644 index 0000000..e47d1eb --- /dev/null +++ b/package-managers/Makefile @@ -0,0 +1,55 @@ +LIBDIR ?= /usr/lib +STATEDIR ?= /var/lib +SYSCONFDIR ?= /etc +PYTHON2_SITELIB = $(shell python2 -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') +PYTHON3_SITELIB = $(shell python3 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') +APTCONFDIR = $(SYSCONFDIR)/apt +YUMCONFDIR = $(SYSCONFDIR)/yum.conf.d +QUBESLIBDIR = $(LIBDIR)/qubes +QUBESSTATEDIR = $(STATEDIR)/qubes + +DIST ?= fc18 + +.PHONY: install install-apt install-dnf install-rpm install-yum + +install: + install -d $(DESTDIR)$(QUBESLIBDIR) + install -t $(DESTDIR)$(QUBESLIBDIR) \ + qubes-download-dom0-updates.sh \ + upgrades-installed-check \ + upgrades-status-notify + install -d -m 2775 $(DESTDIR)$(QUBESSTATEDIR)/dom0-updates + +install-apt: + install -d $(DESTDIR)$(APTCONFDIR)/sources.list.d + sed -e "s/@DIST@/`lsb_release -cs`/" apt-qubes-r4.list.in \ + > $(DESTDIR)$(APTCONFDIR)/sources.list.d/qubes-r4.list + install -D -m 0644 apt-qubes-archive-keyring.gpg \ + $(DESTDIR)$(APTCONFDIR)/trusted.gpg.d/qubes-archive-keyring.gpg + install -D -m 0644 apt-conf-00notify-hook \ + $(DESTDIR)$(APTCONFDIR)/apt.conf.d/00notify-hook + install -D -m 0644 apt-conf-70no-unattended \ + $(DESTDIR)$(APTCONFDIR)/apt.conf.d/70no-unattended + +install-dnf: install-rpm + install -D -m 0644 dnf-qubes-hooks.py \ + $(DESTDIR)$(PYTHON2_SITELIB)/dnf-plugins/qubes-hooks.py + install -D -m 0644 dnf-qubes-hooks.py \ + $(DESTDIR)$(PYTHON3_SITELIB)/dnf-plugins/qubes-hooks.py + install -D -m 0644 dnf-qubes-hooks.conf $(DESTDIR)$(SYSCONFDIR)/dnf/plugins/qubes-hooks.conf + +install-yum: install-rpm + install -d $(DESTDIR)$(LIBDIR)/yum-plugins + install -D -m 0644 yum-qubes-hooks.py \ + $(DESTDIR)$(LIBDIR)/yum-plugins/yum-qubes-hooks.py + install -D -m 0644 yum-qubes-hooks.conf \ + $(DESTDIR)$(SYSCONFDIR)/yum/pluginconf.d/yum-qubes-hooks.conf + +install-rpm: + install -d $(DESTDIR)$(SYSCONFDIR)/yum.repos.d + DIST='$(DIST)'; sed -e "s/@DIST@/$${DIST%%[0-9]*}/g" yum-qubes-r4.repo.in \ + > $(DESTDIR)$(SYSCONFDIR)/yum.repos.d/qubes-r4.repo + install -d $(DESTDIR)$(SYSCONFDIR)/pki/rpm-gpg + install -t $(DESTDIR)$(SYSCONFDIR)/pki/rpm-gpg -m 0644 RPM-GPG-KEY-qubes* + install -d $(DESTDIR)$(YUMCONFDIR) + > $(DESTDIR)$(YUMCONFDIR)/qubes-proxy.conf diff --git a/misc/RPM-GPG-KEY-qubes-4-centos b/package-managers/RPM-GPG-KEY-qubes-4-centos similarity index 100% rename from misc/RPM-GPG-KEY-qubes-4-centos rename to package-managers/RPM-GPG-KEY-qubes-4-centos diff --git a/misc/RPM-GPG-KEY-qubes-4-primary b/package-managers/RPM-GPG-KEY-qubes-4-primary similarity index 100% rename from misc/RPM-GPG-KEY-qubes-4-primary rename to package-managers/RPM-GPG-KEY-qubes-4-primary diff --git a/misc/RPM-GPG-KEY-qubes-4-unstable b/package-managers/RPM-GPG-KEY-qubes-4-unstable similarity index 100% rename from misc/RPM-GPG-KEY-qubes-4-unstable rename to package-managers/RPM-GPG-KEY-qubes-4-unstable diff --git a/network/00notify-hook b/package-managers/apt-conf-00notify-hook similarity index 100% rename from network/00notify-hook rename to package-managers/apt-conf-00notify-hook diff --git a/misc/apt-conf-70no-unattended b/package-managers/apt-conf-70no-unattended similarity index 100% rename from misc/apt-conf-70no-unattended rename to package-managers/apt-conf-70no-unattended diff --git a/misc/qubes-archive-keyring.gpg b/package-managers/apt-qubes-archive-keyring.gpg similarity index 100% rename from misc/qubes-archive-keyring.gpg rename to package-managers/apt-qubes-archive-keyring.gpg diff --git a/misc/qubes-r4.list.in b/package-managers/apt-qubes-r4.list.in similarity index 100% rename from misc/qubes-r4.list.in rename to package-managers/apt-qubes-r4.list.in diff --git a/misc/dnf-qubes-hooks.conf b/package-managers/dnf-qubes-hooks.conf similarity index 100% rename from misc/dnf-qubes-hooks.conf rename to package-managers/dnf-qubes-hooks.conf diff --git a/misc/dnf-qubes-hooks.py b/package-managers/dnf-qubes-hooks.py similarity index 100% rename from misc/dnf-qubes-hooks.py rename to package-managers/dnf-qubes-hooks.py diff --git a/misc/qubes-download-dom0-updates.sh b/package-managers/qubes-download-dom0-updates.sh similarity index 100% rename from misc/qubes-download-dom0-updates.sh rename to package-managers/qubes-download-dom0-updates.sh diff --git a/misc/upgrades-installed-check b/package-managers/upgrades-installed-check similarity index 100% rename from misc/upgrades-installed-check rename to package-managers/upgrades-installed-check diff --git a/misc/upgrades-status-notify b/package-managers/upgrades-status-notify similarity index 100% rename from misc/upgrades-status-notify rename to package-managers/upgrades-status-notify diff --git a/misc/yum-qubes-hooks.conf b/package-managers/yum-qubes-hooks.conf similarity index 100% rename from misc/yum-qubes-hooks.conf rename to package-managers/yum-qubes-hooks.conf diff --git a/misc/yum-qubes-hooks.py b/package-managers/yum-qubes-hooks.py similarity index 100% rename from misc/yum-qubes-hooks.py rename to package-managers/yum-qubes-hooks.py diff --git a/misc/qubes-r4.repo.in b/package-managers/yum-qubes-r4.repo.in similarity index 100% rename from misc/qubes-r4.repo.in rename to package-managers/yum-qubes-r4.repo.in diff --git a/passwordless-root/Makefile b/passwordless-root/Makefile new file mode 100644 index 0000000..928c1ac --- /dev/null +++ b/passwordless-root/Makefile @@ -0,0 +1,12 @@ +SYSCONFDIR ?= /etc +SUDOERSDIR = $(SYSCONFDIR)/sudoers.d +POLKIT1DIR = $(SYSCONFDIR)/polkit-1 + +.PHONY: install + +install: + install -d -m 0750 $(DESTDIR)$(SUDOERSDIR) + install -D -m 0440 qubes.sudoers $(DESTDIR)$(SUDOERSDIR)/qubes + install -D -m 0644 polkit-1-qubes-allow-all.pkla $(DESTDIR)$(POLKIT1DIR)/localauthority/50-local.d/qubes-allow-all.pkla + install -d -m 0750 $(DESTDIR)$(POLKIT1DIR)/rules.d + install -D -m 0644 polkit-1-qubes-allow-all.rules $(DESTDIR)$(POLKIT1DIR)/rules.d/00-qubes-allow-all.rules diff --git a/passwordless-root/debian/Makefile b/passwordless-root/debian/Makefile new file mode 100644 index 0000000..926d678 --- /dev/null +++ b/passwordless-root/debian/Makefile @@ -0,0 +1,7 @@ +SYSCONFDIR ?= /etc +PAMDIR ?= $(SYSCONFDIR)/pam.d + +.PHONY: install + +install: + install -D -m 0644 pam.d_su.qubes $(DESTDIR)$(PAMDIR)/su.qubes diff --git a/misc/pam.d_su.qubes b/passwordless-root/debian/pam.d_su.qubes similarity index 100% rename from misc/pam.d_su.qubes rename to passwordless-root/debian/pam.d_su.qubes diff --git a/misc/polkit-1-qubes-allow-all.pkla b/passwordless-root/polkit-1-qubes-allow-all.pkla similarity index 100% rename from misc/polkit-1-qubes-allow-all.pkla rename to passwordless-root/polkit-1-qubes-allow-all.pkla diff --git a/misc/polkit-1-qubes-allow-all.rules b/passwordless-root/polkit-1-qubes-allow-all.rules similarity index 100% rename from misc/polkit-1-qubes-allow-all.rules rename to passwordless-root/polkit-1-qubes-allow-all.rules diff --git a/misc/qubes.sudoers b/passwordless-root/qubes.sudoers similarity index 100% rename from misc/qubes.sudoers rename to passwordless-root/qubes.sudoers diff --git a/patches.debian/0001-Revert-Use-sfdisk-instead-of-parted-to-resize-root-p.patch b/patches.debian/0001-Revert-Use-sfdisk-instead-of-parted-to-resize-root-p.patch index 5b91fbd..ec2d581 100644 --- a/patches.debian/0001-Revert-Use-sfdisk-instead-of-parted-to-resize-root-p.patch +++ b/patches.debian/0001-Revert-Use-sfdisk-instead-of-parted-to-resize-root-p.patch @@ -13,13 +13,13 @@ karelzak/util-linux#532, which is fixed only in util-linux 2.31.1+ This reverts commit 9792438b3f02161e03d89dfd527ca2459092b478. --- - misc/resize-rootfs | 9 +++++++-- + qubes-rpc/resize-rootfs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -diff --git a/misc/resize-rootfs b/misc/resize-rootfs +diff --git a/qubes-rpc/resize-rootfs b/qubes-rpc/resize-rootfs index 1c2fca3c..bebf1011 100755 ---- a/misc/resize-rootfs -+++ b/misc/resize-rootfs +--- a/qubes-rpc/resize-rootfs ++++ b/qubes-rpc/resize-rootfs @@ -8,8 +8,13 @@ case "$(stat -Lc %t:%T /dev/mapper/dmroot)" in # nothing needed, xvda used directly ;; diff --git a/patches.debian/01_add_anacron.patch b/patches.debian/01_add_anacron.patch index 849325e..3544a43 100644 --- a/patches.debian/01_add_anacron.patch +++ b/patches.debian/01_add_anacron.patch @@ -1,7 +1,7 @@ Index: core-agent-linux/misc/30_cron.conf =================================================================== ---- core-agent-linux.orig/misc/30_cron.conf 2017-01-06 22:47:57.855061937 +0000 -+++ core-agent-linux/misc/30_cron.conf 2017-01-07 01:31:16.382061937 +0000 +--- core-agent-linux.orig/filesystem/30_cron.conf 2017-01-06 22:47:57.855061937 +0000 ++++ core-agent-linux/filesystem/30_cron.conf 2017-01-07 01:31:16.382061937 +0000 @@ -1 +1,2 @@ binds+=( '/var/spool/cron' ) +binds+=( '/var/spool/anacron' ) diff --git a/qubes-rpc/Makefile b/qubes-rpc/Makefile index 90ce274..493a24c 100644 --- a/qubes-rpc/Makefile +++ b/qubes-rpc/Makefile @@ -42,7 +42,7 @@ install: ln -s qvm-copy-to-vm.gnome $(DESTDIR)$(QUBESLIBDIR)/qvm-copy-to-vm.kde ln -s qvm-copy-to-vm.gnome $(DESTDIR)$(QUBESLIBDIR)/qvm-move-to-vm.kde install -t $(DESTDIR)$(QUBESLIBDIR) \ - prepare-suspend \ + prepare-suspend resize-rootfs \ qfile-agent qopen-in-vm qrun-in-vm qubes-sync-clock \ tar2qfile vm-file-editor xdg-icon # Install qfile-unpacker as SUID, because it will fail to receive diff --git a/misc/resize-rootfs b/qubes-rpc/resize-rootfs similarity index 100% rename from misc/resize-rootfs rename to qubes-rpc/resize-rootfs diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 7534d1e..d0e1e36 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -291,11 +291,24 @@ usermod -p '' root %install make install-vm DESTDIR=$RPM_BUILD_ROOT +make -C app-defaults DESTDIR=$RPM_BUILD_ROOT install +make -C app-menu DESTDIR=$RPM_BUILD_ROOT install +make -C boot/redhat DESTDIR=$RPM_BUILD_ROOT install +make -C filesystem DESTDIR=$RPM_BUILD_ROOT install +make -C misc DESTDIR=$RPM_BUILD_ROOT install +make -C network DESTDIR=$RPM_BUILD_ROOT install +make -C passwordless-root DESTDIR=$RPM_BUILD_ROOT install +make -C sys-defaults DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/thunar DESTDIR=$RPM_BUILD_ROOT install +make -C package-managers DESTDIR=$RPM_BUILD_ROOT install install-dnf +%if 0%{?rhel} == 7 +make -C package-managers DESTDIR=$RPM_BUILD_ROOT install-yum +%endif + %if 0%{?rhel} >= 7 sed -i \ -e 's:-primary:-centos:' \ @@ -303,6 +316,9 @@ sed -i \ $RPM_BUILD_ROOT/etc/yum.repos.d/qubes-*.repo %endif +install -D -m 0644 boot/dracut-qubes.conf $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/30-qubes.conf +install -D -m 0644 boot/grub.qubes $RPM_BUILD_ROOT/etc/default/grub.qubes + %triggerin -- initscripts if [ -e /etc/init/serial.conf ]; then cp /usr/share/qubes/serial.conf /etc/init/serial.conf @@ -409,7 +425,7 @@ do continue fi - if [ $(basename $f) == "50-qubes-misc.rules" ] ; then + if [ $(basename $f) == "50-qubes-mem-hotplug.rules" ] ; then continue fi @@ -592,9 +608,11 @@ rm -f %{name}-%{version} %dir /etc/qubes/post-install.d /etc/qubes/post-install.d/README /etc/qubes/post-install.d/*.sh +%config(noreplace) /etc/profile.d/qt_x11_no_mitshm.sh %config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm +%config(noreplace) /etc/sudoers.d/umask %config(noreplace) /etc/sysctl.d/20_tcp_timestamps.conf -%config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules +%config(noreplace) /etc/udev/rules.d/50-qubes-mem-hotplug.rules %config(noreplace) /etc/qubes-suspend-module-blacklist %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf %config(noreplace) /etc/yum.repos.d/qubes-r4.repo diff --git a/misc/20_tcp_timestamps.conf b/sys-defaults/20_tcp_timestamps.conf similarity index 100% rename from misc/20_tcp_timestamps.conf rename to sys-defaults/20_tcp_timestamps.conf diff --git a/sys-defaults/Makefile b/sys-defaults/Makefile new file mode 100644 index 0000000..35be689 --- /dev/null +++ b/sys-defaults/Makefile @@ -0,0 +1,12 @@ +SYSCONFDIR ?= /etc +SUDOERSDIR = $(SYSCONFDIR)/sudoers.d + +.PHONY: install + +install: + install -D -m 0644 profile.d_qt_x11_no_mitshm.sh $(DESTDIR)$(SYSCONFDIR)/profile.d/qt_x11_no_mitshm.sh + install -d -m 0750 $(DESTDIR)$(SUDOERSDIR) + install -D -m 0440 sudoers.d_qt_x11_no_mitshm $(DESTDIR)$(SUDOERSDIR)/qt_x11_no_mitshm + install -D -m 0440 sudoers.d_umask $(DESTDIR)$(SUDOERSDIR)/umask + install -D -m 0644 20_tcp_timestamps.conf $(DESTDIR)$(SYSCONFDIR)/sysctl.d/20_tcp_timestamps.conf + install -D -m 0644 dconf-db-local-dpi $(DESTDIR)$(SYSCONFDIR)/dconf/db/local.d/dpi diff --git a/misc/dconf-db-local-dpi b/sys-defaults/dconf-db-local-dpi similarity index 100% rename from misc/dconf-db-local-dpi rename to sys-defaults/dconf-db-local-dpi diff --git a/misc/profile.d_qt_x11_no_mitshm.sh b/sys-defaults/profile.d_qt_x11_no_mitshm.sh similarity index 100% rename from misc/profile.d_qt_x11_no_mitshm.sh rename to sys-defaults/profile.d_qt_x11_no_mitshm.sh diff --git a/misc/sudoers.d_qt_x11_no_mitshm b/sys-defaults/sudoers.d_qt_x11_no_mitshm similarity index 100% rename from misc/sudoers.d_qt_x11_no_mitshm rename to sys-defaults/sudoers.d_qt_x11_no_mitshm diff --git a/misc/sudoers.d_umask b/sys-defaults/sudoers.d_umask similarity index 100% rename from misc/sudoers.d_umask rename to sys-defaults/sudoers.d_umask