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

This commit is contained in:
Joanna Rutkowska 2012-01-18 14:51:31 +01:00
commit 85417f6baa
2 changed files with 2 additions and 2 deletions

View File

@ -495,7 +495,7 @@ The Qubes core startup configuration for SystemD init.
%post systemd %post systemd
for srv in qubes-dvm qubes-meminfo-writer qubes-qrexec-agent qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network; do for srv in qubes-dvm qubes-meminfo-writer qubes-qrexec-agent qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall; do
/bin/systemctl enable $srv.service /bin/systemctl enable $srv.service
done done

View File

@ -3,7 +3,7 @@
# List of services enabled by default (in case of absence of xenstore entry) # List of services enabled by default (in case of absence of xenstore entry)
DEFAULT_ENABLED_NETVM="network-manager qubes-network" DEFAULT_ENABLED_NETVM="network-manager qubes-network"
DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher" DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher"
DEFAULT_ENABLED_APPVM="meminfo-writer" DEFAULT_ENABLED_APPVM="meminfo-writer cups"
DEFAULT_ENABLED="meminfo-writer" DEFAULT_ENABLED="meminfo-writer"
XS_READ=/usr/bin/xenstore-read XS_READ=/usr/bin/xenstore-read