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

This commit is contained in:
Joanna Rutkowska 2011-04-07 19:17:14 +02:00
commit 80068af4a5

View File

@ -15,6 +15,9 @@ start()
exit 1 exit 1
fi fi
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
chmod 666 /proc/xen/xenbus
name=$(/usr/bin/xenstore-read name) name=$(/usr/bin/xenstore-read name)
if ! [ -f /etc/this_is_dvm ] ; then if ! [ -f /etc/this_is_dvm ] ; then
# we don't want to set hostname for DispVM # we don't want to set hostname for DispVM