From 58496dbac07616c35d958269571b5e12c2dc314a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 6 Feb 2014 23:56:18 +0100 Subject: [PATCH] rpm: move serial.conf to /usr/share/qubes It isn't executable file... --- Makefile | 2 +- rpm_spec/core-vm.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bf1a824..4408863 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ install-vm: install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes install -D -m 0644 misc/qubes-r2-beta2.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta2.repo install -D -m 0644 misc/qubes-r2-beta3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta3.repo - install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/lib/qubes/serial.conf + 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 $(DESTDIR)/usr/share/glib-2.0/schemas/ install -m 0644 misc/org.gnome.settings-daemon.plugins.updates.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/ diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index e760df1..3bbef49 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -101,7 +101,7 @@ make install-vm DESTDIR=$RPM_BUILD_ROOT %triggerin -- initscripts if [ -e /etc/init/serial.conf ]; then - cp /usr/lib/qubes/serial.conf /etc/init/serial.conf + cp /usr/share/qubes/serial.conf /etc/init/serial.conf fi %post @@ -334,7 +334,6 @@ rm -f %{name}-%{version} /usr/lib/qubes/qubes-trigger-sync-appmenus.sh /usr/lib/qubes/qvm-copy-to-vm.gnome /usr/lib/qubes/qvm-copy-to-vm.kde -/usr/lib/qubes/serial.conf /usr/lib/qubes/setup-ip /usr/lib/qubes/tar2qfile /usr/lib/qubes/vm-file-editor @@ -343,6 +342,7 @@ rm -f %{name}-%{version} /usr/lib/yum-plugins/yum-qubes-hooks.py* /usr/sbin/qubes-firewall /usr/sbin/qubes-netwatcher +/usr/share/qubes/serial.conf /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override /usr/share/file-manager/actions/qvm-copy-gnome.desktop /usr/share/file-manager/actions/qvm-dvm-gnome.desktop