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

Merge branch 'master' of git://git.qubes-os.org/marmarek/core

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-11-23 11:35:58 +01:00
commit b73a162005
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/qubes_memory.rules → misc/qubes_misc.rules
View File

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

8
rpm_spec/core-vm.spec
View File

@ -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/
@ -303,6 +303,10 @@ do
continue
fi
if [ $(basename $f) == "50-qubes_misc.rules" ] ; then
continue
fi
if [ $(basename $f) == "99-qubes_network.rules" ] ; then
continue
fi
@ -384,7 +388,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

2
vm-init.d/qubes_core
View File

@ -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

2
vm-systemd/qubes-sysinit.sh
View File

@ -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`