aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-17 13:03:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-05-17 13:03:16 +0000
commitd432e270eaa3c2ab8d7af432e3b7dfdb088bf268 (patch)
tree562a0a0bdbb8de1369ec401f3f797057d290776b
parent649d46a9499ae9a8c7082cc20c1576b47fc88a64 (diff)
downloadalpine_aports-d432e270eaa3c2ab8d7af432e3b7dfdb088bf268.tar.bz2
alpine_aports-d432e270eaa3c2ab8d7af432e3b7dfdb088bf268.tar.xz
alpine_aports-d432e270eaa3c2ab8d7af432e3b7dfdb088bf268.zip
main/xen: misc fixes for xendomains init.d script
- we need create the parent dirs for SCREENDIR - sync the need/after deps with gentoo
-rw-r--r--main/xen/APKBUILD10
-rw-r--r--main/xen/xendomains.initd7
2 files changed, 10 insertions, 7 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 754654b212..ea3cb54076 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,12 +3,12 @@
3# Maintainer: William Pitcock <nenolod@dereferenced.org> 3# Maintainer: William Pitcock <nenolod@dereferenced.org>
4pkgname=xen 4pkgname=xen
5pkgver=4.2.1 5pkgver=4.2.1
6pkgrel=8 6pkgrel=9
7pkgdesc="Xen hypervisor" 7pkgdesc="Xen hypervisor"
8url="http://www.xen.org/" 8url="http://www.xen.org/"
9arch="x86 x86_64" 9arch="x86 x86_64"
10license="GPL" 10license="GPL"
11depends="syslinux bash screen iproute2" 11depends="syslinux bash screen iproute2 logrotate"
12depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev 12depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
13 libiconv-dev dev86 texinfo perl iasl pciutils-dev glib-dev yajl-dev" 13 libiconv-dev dev86 texinfo perl iasl pciutils-dev glib-dev yajl-dev"
14makedepends="$depends_dev" 14makedepends="$depends_dev"
@@ -166,7 +166,7 @@ ed262f15fb880badb53575539468646c xenconsoled.initd
166ec2252c72050d7d5870a3a629b873ba6 xenconsoled.confd 166ec2252c72050d7d5870a3a629b873ba6 xenconsoled.confd
1671803ddf6877bdf254082365389a4efa9 xend.initd 1671803ddf6877bdf254082365389a4efa9 xend.initd
1689261ad0f285836c1b0ea07f306e4586e xend.confd 1689261ad0f285836c1b0ea07f306e4586e xend.confd
169197493d10d1adb4daa272b0c0321a54a xendomains.initd 169fa8c72b42e0479d521a353386d8543ef xendomains.initd
1702c80e442cec6dd2a025b61852641834d xendomains.confd 1702c80e442cec6dd2a025b61852641834d xendomains.confd
1719df68ac65dc3f372f5d61183abdc83ff xen-consoles.logrotate 1719df68ac65dc3f372f5d61183abdc83ff xen-consoles.logrotate
1726a2f777c16678d84039acf670d86fff6 xenqemu.confd 1726a2f777c16678d84039acf670d86fff6 xenqemu.confd
@@ -194,7 +194,7 @@ ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.conf
1942a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 xenconsoled.confd 1942a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 xenconsoled.confd
195a50a4485e84bcc098ad021556cd2aa7947c228f0a546ab942e880787ced57be3 xend.initd 195a50a4485e84bcc098ad021556cd2aa7947c228f0a546ab942e880787ced57be3 xend.initd
1967f7a96349084474b76af98426387fec12a0684f505d1691091ac3d2556bde2de xend.confd 1967f7a96349084474b76af98426387fec12a0684f505d1691091ac3d2556bde2de xend.confd
197023ab6fdc4c386e4f134b0cb01a892f4cd4d3f8c51fea70b41ac399d59127fb3 xendomains.initd 197794bed4882cdce8d9ac91d9afc0d5da0f0ac97f38d90c5e965363139a834602d xendomains.initd
1982360b1fa1f102ac1b1a6cd0d161a94d13139dfc21d9a2227d35d557b4f04a63e xendomains.confd 1982360b1fa1f102ac1b1a6cd0d161a94d13139dfc21d9a2227d35d557b4f04a63e xendomains.confd
1990da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 xen-consoles.logrotate 1990da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 xen-consoles.logrotate
2004cfcddcade5d055422ab4543e8caa6e5c5eee7625c41880a9000b7a87c7c424e xenqemu.confd 2004cfcddcade5d055422ab4543e8caa6e5c5eee7625c41880a9000b7a87c7c424e xenqemu.confd
@@ -222,7 +222,7 @@ cfcf8d1af07032bfd3ff9c7a76a8f7d8c6f8b3b084712a494c3ca7624d9a03cbb7cad723b5a1dbc2
22230df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d xenconsoled.confd 22230df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d xenconsoled.confd
22355766e22d9374b404b96fba9d30aee49bee6c95fabce9c3d2aed1faba04c1573ecd75fe49e27ce1527ecf9064f53ccc15e4c69a1aa4ea3daa44828f38d687d85 xend.initd 22355766e22d9374b404b96fba9d30aee49bee6c95fabce9c3d2aed1faba04c1573ecd75fe49e27ce1527ecf9064f53ccc15e4c69a1aa4ea3daa44828f38d687d85 xend.initd
22439b38156f0a8498dbbe9aa58d320b85473d0999d62d2e33bb6bf53627fc41f2c67ec318dfab70d2063799f4cd9eeadc015b66fbb211ee3ef765492421a718608 xend.confd 22439b38156f0a8498dbbe9aa58d320b85473d0999d62d2e33bb6bf53627fc41f2c67ec318dfab70d2063799f4cd9eeadc015b66fbb211ee3ef765492421a718608 xend.confd
2255b069cc609b28ba6f05901173e8ad9688a1396de2699791182688119b96386fed4696d469eb8f96f2966211647379f604593bdc625dbda765bd21dc19f742625 xendomains.initd 2251bef9f2905a4e62f4f2d22c0b8ae9779d9b9ab7a7dbd37a13afa6f21102c7b38cae0b2b11ab5637faad20b026e6a69416fd5e9a39f82da6c4c117784f8acbb53 xendomains.initd
2267c1e32d07aefbde1904ca2d98f9a415543cea7ab8e039b05e0b111e37e78c07c40b540e439b3656d5840dfd76e35e07cf1d6ddea431163d975b1ddf5ddac50d3 xendomains.confd 2267c1e32d07aefbde1904ca2d98f9a415543cea7ab8e039b05e0b111e37e78c07c40b540e439b3656d5840dfd76e35e07cf1d6ddea431163d975b1ddf5ddac50d3 xendomains.confd
227ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 xen-consoles.logrotate 227ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 xen-consoles.logrotate
228bdbe15c924071cdc2d0f23e53ba8e3f837d4b5369bfb218abd3405f9bef25d105269aaf0784baeb69c073a5786b8c82ffdfd414e86874da34293cfdc2c497928 xenqemu.confd 228bdbe15c924071cdc2d0f23e53ba8e3f837d4b5369bfb218abd3405f9bef25d105269aaf0784baeb69c073a5786b8c82ffdfd414e86874da34293cfdc2c497928 xenqemu.confd
diff --git a/main/xen/xendomains.initd b/main/xen/xendomains.initd
index 794a78697f..27464c6856 100644
--- a/main/xen/xendomains.initd
+++ b/main/xen/xendomains.initd
@@ -6,8 +6,8 @@
6extra_commands="status" 6extra_commands="status"
7 7
8depend() { 8depend() {
9 need xenstored xenconsoled 9 need xenstored
10 after dhcp 10 after dhcp xend xenconsoled
11} 11}
12 12
13get_domname() { 13get_domname() {
@@ -30,6 +30,9 @@ using_screen() {
30 30
31set_screen_cmd() { 31set_screen_cmd() {
32 export SCREENDIR=${SCREENDIR:-/tmp/screens/S-root} 32 export SCREENDIR=${SCREENDIR:-/tmp/screens/S-root}
33 # create the parent dirs
34 mkdir -p "$SCREENDIR"
35 # set permissions
33 checkpath -d -m 700 "$SCREENDIR" 36 checkpath -d -m 700 "$SCREENDIR"
34 screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X" 37 screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X"
35} 38}