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

Conflicts:
	rpm_spec/core-dom0.spec
This commit is contained in:
Joanna Rutkowska 2011-04-07 19:39:42 +02:00
commit f6d4f86edc
2 changed files with 11 additions and 1 deletions

7
dom0/qubes-guid.desktop Normal file
View File

@ -0,0 +1,7 @@
[Desktop Entry]
Name=Qubes Guid
Comment=Starts Dom0 GUI daemon for Qubes VMs
Icon=qubes
Exec=qvm-run --all true
Terminal=false
Type=Application

View File

@ -139,6 +139,9 @@ install -D ../u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
install -d $RPM_BUILD_ROOT/etc/sudoers.d
install -m 0440 qubes.sudoers $RPM_BUILD_ROOT/etc/sudoers.d/qubes
install -d $RPM_BUILD_ROOT/etc/xdg/autostart
install -m 0644 qubes-guid.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/
%post
# Create NetworkManager configuration if we do not have it
@ -291,7 +294,7 @@ fi
%{_libdir}/libvchan.so
%{_libdir}/libu2mfn.so
/etc/sudoers.d/qubes
/etc/xdg/autostart/qubes-guid.desktop
%package vaio-fixes
Summary: Additional scripts for supporting suspend on Vaio Z laptops