Jelajahi Sumber

vm: setup /dev/xen/evtchn permissions using udev rule

This works also when the device is recreated, which is the case in DispVM
(during xl restore).
Marek Marczykowski 11 tahun lalu
induk
melakukan
213380a7c3
4 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 1 0
      misc/qubes_misc.rules
  2. 2 2
      rpm_spec/core-vm.spec
  3. 1 1
      vm-init.d/qubes_core
  4. 1 1
      vm-systemd/qubes-sysinit.sh

+ 1 - 0
misc/qubes_memory.rules → misc/qubes_misc.rules

@@ -1 +1,2 @@
 SUBSYSTEM=="memory", ACTION=="add", ATTR{state}=="offline", ATTR{state}="online"
+KERNEL=="xen/evtchn", MODE="0666"

+ 2 - 2
rpm_spec/core-vm.spec

@@ -113,7 +113,7 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 misc/RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 install -D misc/xenstore-watch $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
-install -m 0644 misc/qubes_memory.rules $RPM_BUILD_ROOT/etc/udev/rules.d/50-qubes_memory.rules
+install -m 0644 misc/qubes_misc.rules $RPM_BUILD_ROOT/etc/udev/rules.d/50-qubes_misc.rules
 install -m 0644 misc/qubes_block.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_block.rules
 install -m 0644 misc/qubes_usb.rules $RPM_BUILD_ROOT/etc/udev/rules.d/99-qubes_usb.rules
 install -d $RPM_BUILD_ROOT/usr/lib/qubes/
@@ -384,7 +384,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/modules/qubes_misc.modules
 /etc/tinyproxy/filter-qubes-yum
 /etc/tinyproxy/tinyproxy-qubes-yum.conf
-/etc/udev/rules.d/50-qubes_memory.rules
+/etc/udev/rules.d/50-qubes_misc.rules
 /etc/udev/rules.d/99-qubes_block.rules
 /etc/udev/rules.d/99-qubes_network.rules
 /etc/udev/rules.d/99-qubes_usb.rules

+ 1 - 1
vm-init.d/qubes_core

@@ -18,7 +18,7 @@ start()
 	# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
 	chmod 666 /proc/xen/xenbus
 	# Set permissions to files needed to listen at vchan
-	chmod 666 /proc/u2mfn /dev/xen/evtchn
+	chmod 666 /proc/u2mfn
 
 	mkdir -p /var/run/xen-hotplug
 

+ 1 - 1
vm-systemd/qubes-sysinit.sh

@@ -26,7 +26,7 @@ mkdir -p /var/run/xen-hotplug
 # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
 chmod 666 /proc/xen/xenbus
 # Set permissions to files needed to listen at vchan
-chmod 666 /proc/u2mfn /dev/xen/evtchn
+chmod 666 /proc/u2mfn
 
 # Set default services depending on VM type
 TYPE=`$XS_READ qubes_vm_type 2> /dev/null`