aboutsummaryrefslogtreecommitdiffstats
path: root/main/xen
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-06-22 14:22:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-06-22 14:22:26 +0000
commit01f58adb24ce238a77eeac9569e708dbb121776d (patch)
tree0a83b37981d2d8bbcd708b7da0e0f63eb5f27f78 /main/xen
parentb06fcf3d5f6e8a4922937a00ba8b8ced4452905d (diff)
downloadaports-01f58adb24ce238a77eeac9569e708dbb121776d.tar.bz2
aports-01f58adb24ce238a77eeac9569e708dbb121776d.tar.xz
main/xen: use default screendir location
Otherwise screen -x will not work without manually setting screen dir
Diffstat (limited to 'main/xen')
-rw-r--r--main/xen/APKBUILD6
-rw-r--r--main/xen/xendomains.confd5
-rw-r--r--[-rwxr-xr-x]main/xen/xendomains.initd2
3 files changed, 9 insertions, 4 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 8b6f99802c..ea31d32000 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=xen
pkgver=4.1.2
-pkgrel=11
+pkgrel=12
pkgdesc="Xen hypervisor"
url="http://www.xen.org/"
arch="x86 x86_64"
@@ -137,6 +137,6 @@ ed262f15fb880badb53575539468646c xenconsoled.initd
ec2252c72050d7d5870a3a629b873ba6 xenconsoled.confd
89c936ddf327a3a78eaee33835880517 xend.initd
9261ad0f285836c1b0ea07f306e4586e xend.confd
-9cc0883d472987038fd464a7e28372e3 xendomains.initd
-f3162b7c261bcaf49a67bd41d987df84 xendomains.confd
+35448ff063f8123ec4bba2e001f39c6c xendomains.initd
+9b20e056d475b50586cf9e1fc94e13c4 xendomains.confd
9df68ac65dc3f372f5d61183abdc83ff xen-consoles.logrotate"
diff --git a/main/xen/xendomains.confd b/main/xen/xendomains.confd
index a180c13d85..ed87b816ff 100644
--- a/main/xen/xendomains.confd
+++ b/main/xen/xendomains.confd
@@ -23,3 +23,8 @@ SCREEN_NAME="xen"
# in the event of a crash.
SCREEN_LOG_INTERVAL="1"
+
+# The location where screen stores the connection sockets
+
+SCREENDIR=/tmp/screens/S-root
+
diff --git a/main/xen/xendomains.initd b/main/xen/xendomains.initd
index c791e3e585..ce3c0c3b94 100755..100644
--- a/main/xen/xendomains.initd
+++ b/main/xen/xendomains.initd
@@ -29,7 +29,7 @@ using_screen() {
}
set_screen_cmd() {
- export SCREENDIR=/var/run/xen-screens
+ export SCREENDIR=${SCREENDIR:-/tmp/screens/S-root}
checkpath --directory --mode 700 "$SCREENDIR"
screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X"
}