From c13471f91fbc02af5ebaf98404a4250ac091ff86 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 4 Jan 2008 12:39:06 +0000
Subject: Fix detection of Xen dom0 vs domU can use the right variable in init
 scripts.

---
 init.d.Linux/consolefont | 2 +-
 init.d.Linux/keymaps     | 2 +-
 src/rc-misc.c            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/init.d.Linux/consolefont b/init.d.Linux/consolefont
index 824a848e..d2930a15 100755
--- a/init.d.Linux/consolefont
+++ b/init.d.Linux/consolefont
@@ -36,7 +36,7 @@ start() {
 	rm -rf "${RC_LIBDIR}"/console
 
 	case "${RC_SYS}" in
-		UML|VPS|XEN) return 0;;
+		UML|VPS|XENU) return 0;;
 	esac
 
 	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
diff --git a/init.d.Linux/keymaps b/init.d.Linux/keymaps
index 4af63838..28cb9c6d 100755
--- a/init.d.Linux/keymaps
+++ b/init.d.Linux/keymaps
@@ -39,7 +39,7 @@ depend() {
 
 start() {
 	case "${RC_SYS}" in
-		UML|VPS|XEN)
+		UML|VPS|XENU)
 			ebegin "Loading key mappings"
 			eend 0
 			return 0
diff --git a/src/rc-misc.c b/src/rc-misc.c
index b46e2273..0d8b8c1f 100644
--- a/src/rc-misc.c
+++ b/src/rc-misc.c
@@ -295,10 +295,10 @@ char **env_config (void)
 		if ((fp = fopen ("/proc/xen/capabilities", "r"))) {
 			fclose (fp);
 			if (file_regex ("/proc/xen/capabilities", "control_d"))
-				snprintf (sys, sizeof (sys), "XENU");
+				snprintf (sys, sizeof (sys), "XEN0");
 		}
 		if (! sys[0])
-			snprintf (sys, sizeof (sys), "XEN0");
+			snprintf (sys, sizeof (sys), "XENU");
 	} else if (file_regex ("/proc/cpuinfo", "UML")) {
 		snprintf (sys, sizeof (sys), "UML");
 	} else if (file_regex ("/proc/self/status",
-- 
cgit v1.2.3