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 <doogie@brainfood.com>

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d54268186edad91f96dea3424a07f60bd25fb96b..05d987fd88a68b384cc456b56aed003366445330 100644 (file)
--- 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 fc94c17dd2178bd39f01e2ed7c497a9f0a3c51eb..058f6a821f726b6c3761a4c112283b47ed33955f 100755 (executable)
--- 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 c52c3cc0e9758d07c56d549940d4f7d11c1400fd..3180f45aa20f9578c202edb0b771552224a418a1 100755 (executable)
--- a/tools/examples/init.d/xendomains
+++ b/tools/examples/init.d/xendomains
@@ -15,6 +15,10 @@
 # <http://www.tldp.org/HOWTO/HighQuality-Apps-HOWTO/>
 #
 
+if ! [ -e /proc/xen/privcmd ]; then
+       exit 0
+fi
+
 RETVAL=0
 
 INITD=/etc/init.d