From e2682df71cee33602b6829d735fbad0d5f5dbe5e Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amit.mahajan@b-labs.co.uk>
Date: Fri, 20 Nov 2009 10:35:36 +0530
Subject: [PATCH] Bahadir's comments added

---
 config/cml/container_ruleset.template | 22 +++++++++++-----------
 config/configuration.py               |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template
index 6ade069..1f109ee 100644
--- a/config/cml/container_ruleset.template
+++ b/config/cml/container_ruleset.template
@@ -1,6 +1,6 @@
 symbols
 CONT%(cn)d_TYPE_LINUX		'Linux Container'
-CONT%(cn)d_TYPE_BAREMETAL	'Barebones Container'
+CONT%(cn)d_TYPE_BAREMETAL	'Baremetal Container'
 CONT%(cn)d_TYPE_POSIX		'POSIX Container'
 CONT%(cn)d_OPT_NAME		'Container Name'
 
@@ -156,18 +156,18 @@ cont%(cn)d_linux_pager_params	'Container %(cn)d Linux Pager Parameters'
 cont%(cn)d_default_pager_params	'Container %(cn)d Default Pager Parameters'
 cont%(cn)d_posix_pager_params	'Container %(cn)d POSIX Pager Parameters'
 
-cont%(cn)d_baremetal_params	'Baremetal Applications List'
-CONT%(cn)d_BAREMETAL_APP0	'Empty Application'
-CONT%(cn)d_BAREMETAL_APP1	'Hello World'
-CONT%(cn)d_BAREMETAL_APP2	'Thread Library Demo'
-CONT%(cn)d_BAREMETAL_APP3       'Test Application'
+cont%(cn)d_baremetal_params	'Baremetal Project'
+CONT%(cn)d_BAREMETAL_PROJ0	'Empty Project'
+CONT%(cn)d_BAREMETAL_PROJ1	'Hello World'
+CONT%(cn)d_BAREMETAL_PROJ2	'Thread Library Demo'
+CONT%(cn)d_BAREMETAL_PROJ3      'Test Project'
 
 choices cont%(cn)d_baremetal_params
-	CONT%(cn)d_BAREMETAL_APP0
-	CONT%(cn)d_BAREMETAL_APP1
-	CONT%(cn)d_BAREMETAL_APP2
-	CONT%(cn)d_BAREMETAL_APP3
-	default CONT%(cn)d_BAREMETAL_APP0
+	CONT%(cn)d_BAREMETAL_PROJ0
+	CONT%(cn)d_BAREMETAL_PROJ1
+	CONT%(cn)d_BAREMETAL_PROJ2
+	CONT%(cn)d_BAREMETAL_PROJ3
+	default CONT%(cn)d_BAREMETAL_PROJ0
 
 menu cont%(cn)d_default_pager_params
 	CONT%(cn)d_PAGER_LMA@
diff --git a/config/configuration.py b/config/configuration.py
index f8c2fdc..66dd477 100644
--- a/config/configuration.py
+++ b/config/configuration.py
@@ -173,7 +173,7 @@ class configuration:
             dirname = val[1:-1].lower()
             self.containers[id].dirname = dirname
             self.containers[id].name = dirname
-        elif param[:len("BAREMETAL_APP")] == "BAREMETAL_APP":
+        elif param[:len("BAREMETAL_PROJ")] == "BAREMETAL_PROJ":
             param1 = param.split("_", 1)
             self.containers[id].baremetal_id = param1[1][-1:]
         elif param[:len("CAP_")] == "CAP_":