|
@@ -1,4 +1,4 @@
|
|
-#!/bin/sh
|
|
|
|
|
|
+#!/bin/bash
|
|
|
|
|
|
# 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 qubes-update-check qubes-yum-proxy"
|
|
DEFAULT_ENABLED_NETVM="network-manager qubes-network qubes-update-check qubes-yum-proxy"
|
|
@@ -7,8 +7,8 @@ DEFAULT_ENABLED_APPVM="meminfo-writer cups qubes-update-check"
|
|
DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM yum-proxy-setup"
|
|
DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM yum-proxy-setup"
|
|
DEFAULT_ENABLED="meminfo-writer"
|
|
DEFAULT_ENABLED="meminfo-writer"
|
|
|
|
|
|
-XS_READ=/usr/bin/xenstore-read
|
|
|
|
-XS_LS=/usr/bin/xenstore-ls
|
|
|
|
|
|
+XS_READ=xenstore-read
|
|
|
|
+XS_LS=xenstore-ls
|
|
|
|
|
|
read_service() {
|
|
read_service() {
|
|
$XS_READ qubes-service/$1 2> /dev/null
|
|
$XS_READ qubes-service/$1 2> /dev/null
|
|
@@ -31,6 +31,8 @@ mkdir -p /var/run/xen-hotplug
|
|
|
|
|
|
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
|
|
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
|
|
chmod 666 /proc/xen/xenbus
|
|
chmod 666 /proc/xen/xenbus
|
|
|
|
+
|
|
|
|
+[ -e /proc/u2mfn ] || modprobe u2mfn
|
|
# Set permissions to files needed to listen at vchan
|
|
# Set permissions to files needed to listen at vchan
|
|
chmod 666 /proc/u2mfn
|
|
chmod 666 /proc/u2mfn
|
|
|
|
|
|
@@ -65,9 +67,13 @@ fi
|
|
|
|
|
|
timezone=`$XS_READ qubes-timezone 2> /dev/null`
|
|
timezone=`$XS_READ qubes-timezone 2> /dev/null`
|
|
if [ -n "$timezone" ]; then
|
|
if [ -n "$timezone" ]; then
|
|
- ln -f /usr/share/zoneinfo/$timezone /etc/localtime
|
|
|
|
- echo "# Clock configuration autogenerated based on Qubes dom0 settings" > /etc/sysconfig/clock
|
|
|
|
- echo "ZONE=\"$timezone\"" >> /etc/sysconfig/clock
|
|
|
|
|
|
+ cp -p /usr/share/zoneinfo/$timezone /etc/localtime
|
|
|
|
+ if [ -e /etc/debian_version ]; then
|
|
|
|
+ echo "$timezone" > /etc/timezone
|
|
|
|
+ else
|
|
|
|
+ echo "# Clock configuration autogenerated based on Qubes dom0 settings" > /etc/sysconfig/clock
|
|
|
|
+ echo "ZONE=\"$timezone\"" >> /etc/sysconfig/clock
|
|
|
|
+ fi
|
|
fi
|
|
fi
|
|
|
|
|
|
# Prepare environment for other services
|
|
# Prepare environment for other services
|