From f754cfd2a936d8ccc13839f9ecdefc663bf746f6 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 23 May 2007 12:30:34 +0000 Subject: RC_SYS should now set XEN0 correctly --- src/librc-misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/librc-misc.c') diff --git a/src/librc-misc.c b/src/librc-misc.c index ecb403a0..f527ef11 100644 --- a/src/librc-misc.c +++ b/src/librc-misc.c @@ -677,13 +677,15 @@ char **rc_config_env (char **env) if (file_regex ("/proc/xen/capabilities", "control_d")) snprintf (sys, sizeof (sys), "XENU"); } - if (! sys) + if (! sys[0]) snprintf (sys, sizeof (sys), "XEN0"); - } else if (file_regex ("/proc/cpuinfo", "UML")) + } else if (file_regex ("/proc/cpuinfo", "UML")) { snprintf (sys, sizeof (sys), "UML"); - else if (file_regex ("/proc/self/status", - "(s_context|VxID|envID):[[:space:]]*[1-9]")) - snprintf (sys, sizeof (sys), "VPS"); + } else if (file_regex ("/proc/self/status", + "(s_context|VxID|envID):[[:space:]]*[1-9]")) + { + snprintf (sys, sizeof (sys), "VPS"); + } #endif /* Only add a NET_FS list if not defined */ -- cgit v1.2.3