From 61b59d9dd59957229d0938a7549b7ce8dcbda254 Mon Sep 17 00:00:00 2001 From: "doogie@brainfood.com[kaf24]" Date: Sat, 12 Mar 2005 15:28:18 +0000 Subject: [PATCH] bitkeeper revision 1.1159.270.2 (42330a929cE0pKehTkalVAgu8SLwKQ) [PATCH] non-xen-init-exit.patch Name: non-xen-init-exit.patch Description: exit if not running on a xen dom0 kernel. If /proc/xen/privcmd doesn't exist, then exit successfully. This allows for dual-boot setups, and installing xen before rebooting into a real xen kernel. Signed-off-by: Adam Heath --- BitKeeper/etc/logging_ok | 1 + tools/examples/init.d/xend | 4 ++++ tools/examples/init.d/xendomains | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d54268186e..05d987fd88 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -16,6 +16,7 @@ cl349@freefall.cl.cam.ac.uk cl349@labyrinth.cl.cam.ac.uk cwc22@centipede.cl.cam.ac.uk djm@kirby.fc.hp.com +doogie@brainfood.com gm281@boulderdash.cl.cam.ac.uk gm281@tetrapod.cl.cam.ac.uk iap10@freefall.cl.cam.ac.uk diff --git a/tools/examples/init.d/xend b/tools/examples/init.d/xend index fc94c17dd2..058f6a821f 100755 --- a/tools/examples/init.d/xend +++ b/tools/examples/init.d/xend @@ -7,6 +7,10 @@ # chkconfig: 2345 98 01 # description: Starts and stops the Xen control daemon. +if ! [ -e /proc/xen/privcmd ]; then + exit 0 +fi + # Wait for Xend / Xfrd to be up function await_daemons_up { diff --git a/tools/examples/init.d/xendomains b/tools/examples/init.d/xendomains index c52c3cc0e9..3180f45aa2 100755 --- a/tools/examples/init.d/xendomains +++ b/tools/examples/init.d/xendomains @@ -15,6 +15,10 @@ # # +if ! [ -e /proc/xen/privcmd ]; then + exit 0 +fi + RETVAL=0 INITD=/etc/init.d -- 2.30.2