main/xen: make sure /var/run/xen exists

- start xendomains after localmount so localmount does not mount over
  our /var

- add checkpath to xendomains, just in case

ref #2837

3 files changed, 11 insertions, 9 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 0f78d2677..97d8a1688 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86_64"
@@ -214,13 +214,13 @@ e449bb3359b490804ffc7b0ae08d62a0  hotplug-vif-vtrill.patch
 229539a822e14a6a62babffd71ecfbf3  0001-ipxe-dont-clobber-ebp.patch
 08a30d56902b660f5102a5c208e545c9  init-xenstore-domain.patch
 f7aa282a27f270a923f229f2040cd7b5  musl-support.patch
-3178b2ccd06c608b17444231831d4245  xenstored.initd
+bd6d294c47d4285e770aefa6e63eeea2  xenstored.initd
 d86504e12f05deca6b3eeeb90157160e  xenstored.confd
 ed262f15fb880badb53575539468646c  xenconsoled.initd
 ec2252c72050d7d5870a3a629b873ba6  xenconsoled.confd
 1803ddf6877bdf254082365389a4efa9  xend.initd
 9261ad0f285836c1b0ea07f306e4586e  xend.confd
-fa8c72b42e0479d521a353386d8543ef  xendomains.initd
+10f3ab45a6d0a241b9c7e9757ad59ad8  xendomains.initd
 2c80e442cec6dd2a025b61852641834d  xendomains.confd
 9df68ac65dc3f372f5d61183abdc83ff  xen-consoles.logrotate
 6a2f777c16678d84039acf670d86fff6  xenqemu.confd
@@ -242,13 +242,13 @@ dd1e784bc455eb62cb85b3fa24bfc34f575ceaab9597ef6a2f1ee7ff7b3cae0a  hotplug-vif-vt
 751ef06569de66578b8713dc170976832b0671ac2696f32eb9ad69d60332d594  0001-ipxe-dont-clobber-ebp.patch
 0204d69804e83864cd6b2122f51b9c1940588158a35c159a7ef0c3b8fb0af4cb  init-xenstore-domain.patch
 2513ab530c80b32bd7fe4d35a5b1ecbda14c8e093e556e040a68226796e63791  musl-support.patch
-6ba1fb78d28c6acd47348b79f14620dc6fdd3308580e6a1e82a5e7fb06ff6de0  xenstored.initd
+2f3fa767e57c18433d196bb2aecfb575224183193f4acece85971683a9a5411b  xenstored.initd
 991bb7c9da02941556e29714bd96b26e39e57e0a5b514eadd78d9bfa3fa5a9dc  xenstored.confd
 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01  xenconsoled.initd
 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060  xenconsoled.confd
 a50a4485e84bcc098ad021556cd2aa7947c228f0a546ab942e880787ced57be3  xend.initd
 7f7a96349084474b76af98426387fec12a0684f505d1691091ac3d2556bde2de  xend.confd
-794bed4882cdce8d9ac91d9afc0d5da0f0ac97f38d90c5e965363139a834602d  xendomains.initd
+c304a6353ba1daebd0547bb57e9ffffc2c90465d6abe7469cfdacf61c5108eab  xendomains.initd
 2360b1fa1f102ac1b1a6cd0d161a94d13139dfc21d9a2227d35d557b4f04a63e  xendomains.confd
 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19  xen-consoles.logrotate
 4cfcddcade5d055422ab4543e8caa6e5c5eee7625c41880a9000b7a87c7c424e  xenqemu.confd
@@ -270,13 +270,13 @@ f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2
 c3a1b270347a99c8ce21118010ad8d817b4462a31cc5c75352faa7086969ef0646f3f4d0922d85c2e504cff091ce7e9fe79c92f983c2ba4af2fae85c52c3835a  0001-ipxe-dont-clobber-ebp.patch
 475eb800660dc928914b8c15562f18f24d6e7a76f4cc7bed9249ce52d444c29aec1aef843eb37ade0c7c9616195bbbc1606a3195e25b2bd4b6a1d1af5f69256e  init-xenstore-domain.patch
 3d6b180d631c6d7baeff9976503cf6b16f24b0e99c25b2b2a5153db85f41600159d10d4f47eda0e33e1f41197dc9d6d935cf33f31ffbcf429d35002e0affdb2d  musl-support.patch
-0329596bde7227a9f2b5a8f50c0bc404b45765384b6bade164ec3549fde5a667972f9f5659fecc04db97539e3acc5147f16e1da430c418a2a1bff18148044900  xenstored.initd
+7a21f7cc05d5593a96ca5254ffed55919de97d7a1fe0d5b360876a5c0811416c9f985682c5b70325d99166ebabd149d0d061ea58da4283b2b0d2aab0d75e5368  xenstored.initd
 093f7fbd43faf0a16a226486a0776bade5dc1681d281c5946a3191c32d74f9699c6bf5d0ab8de9d1195a2461165d1660788e92a3156c9b3c7054d7b2d52d7ff0  xenstored.confd
 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137  xenconsoled.initd
 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d  xenconsoled.confd
 55766e22d9374b404b96fba9d30aee49bee6c95fabce9c3d2aed1faba04c1573ecd75fe49e27ce1527ecf9064f53ccc15e4c69a1aa4ea3daa44828f38d687d85  xend.initd
 39b38156f0a8498dbbe9aa58d320b85473d0999d62d2e33bb6bf53627fc41f2c67ec318dfab70d2063799f4cd9eeadc015b66fbb211ee3ef765492421a718608  xend.confd
-1bef9f2905a4e62f4f2d22c0b8ae9779d9b9ab7a7dbd37a13afa6f21102c7b38cae0b2b11ab5637faad20b026e6a69416fd5e9a39f82da6c4c117784f8acbb53  xendomains.initd
+d1008996e486bc8243abd0c3f50755da0f414009ba81eebe943514e29c7e2440af3e4aa0bc46258f05a502a7876783e834756b02dc72161be1ab3808e6abe67b  xendomains.initd
 7c1e32d07aefbde1904ca2d98f9a415543cea7ab8e039b05e0b111e37e78c07c40b540e439b3656d5840dfd76e35e07cf1d6ddea431163d975b1ddf5ddac50d3  xendomains.confd
 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426  xen-consoles.logrotate
 bdbe15c924071cdc2d0f23e53ba8e3f837d4b5369bfb218abd3405f9bef25d105269aaf0784baeb69c073a5786b8c82ffdfd414e86874da34293cfdc2c497928  xenqemu.confd
diff --git a/main/xen/xendomains.initd b/main/xen/xendomains.initd
index 27464c685..e6751eeea 100644
--- a/main/xen/xendomains.initd
+++ b/main/xen/xendomains.initd
@@ -16,7 +16,7 @@ get_domname() {
 	if [ -z ${name_from_file} ]; then
 		basename "${1}"
 	else
-		echo ${name_from_file}	
+		echo ${name_from_file}
 	fi
 }
 
@@ -51,6 +51,7 @@ wait_screen() {
 
 start() {
 	set_screen_cmd
+	checkpath --directory --mode 755 /var/run/xen
 
 	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
 	if using_screen ; then
diff --git a/main/xen/xenstored.initd b/main/xen/xenstored.initd
index 94237e35f..cfb6957d4 100644
--- a/main/xen/xenstored.initd
+++ b/main/xen/xenstored.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+	after localmount
 }
 
 wait_xenstored_up() {
@@ -20,13 +21,13 @@ wait_xenstored_up() {
 }
 
 start() {
+	checkpath --directory --mode 755 /var/run/xen
 	if xenstore-read -s / >/dev/null 2>&1; then
 		ewarn "Xenstore can only be started once"
 		return 0
 	fi
 	local _traceopt=
 
-	checkpath --directory /var/run/xen
 	ebegin "Starting xenstored daemon"
 
 	if ! test -f /proc/xen/capabilities && \