From f6e759c3f0c652afa4ae1887ad1abd64cf2a23c5 Mon Sep 17 00:00:00 2001 From: Bahadir Balban Date: Thu, 1 Oct 2009 17:04:17 +0300 Subject: [PATCH] Changed container configuration parameter DIRNAME to NAME Dirname was not a precise description as the name did not always get used as a directory name. --- config/cml/container.template.cml | 6 +++--- config/configuration.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cml/container.template.cml b/config/cml/container.template.cml index afd7b51..313212e 100644 --- a/config/cml/container.template.cml +++ b/config/cml/container.template.cml @@ -2,7 +2,7 @@ symbols CONT%d_TYPE_LINUX 'Linux Container' CONT%d_TYPE_BARE 'Bare Container' CONT%d_TYPE_POSIX 'Codezero POSIX Services' -CONT%d_OPT_DIRNAME 'Containers directory name under conts' +CONT%d_OPT_NAME 'Container name' CONT%d_PHYSMEM_REGIONS 'Container %d number of physical regions' CONT%d_PHYS0_START 'Container %d physical start address' @@ -95,7 +95,7 @@ default CONT%d_VIRT4_END from 0x0 default CONT%d_VIRT5_START from 0x0 default CONT%d_VIRT5_END from 0x0 -default CONT%d_OPT_DIRNAME from (CONT%d_TYPE_LINUX==y) ? "linux%d" : ((CONT%d_TYPE_BARE==y) ? "bare%d" : "posix%d") +default CONT%d_OPT_NAME from (CONT%d_TYPE_LINUX==y) ? "linux%d" : ((CONT%d_TYPE_BARE==y) ? "bare%d" : "posix%d") when CONT%d_TYPE_LINUX==y suppress cont%d_bare_pager_params when CONT%d_TYPE_BARE==y suppress cont%d_linux_pager_params @@ -148,7 +148,7 @@ menu cont%d_physmem_list CONT%d_PHYS3_END@ menu container%d_options - CONT%d_OPT_DIRNAME$ + CONT%d_OPT_NAME$ cont%d_linux_pager_params cont%d_bare_pager_params cont%d_physmem_list diff --git a/config/configuration.py b/config/configuration.py index f083c74..19cd9e9 100644 --- a/config/configuration.py +++ b/config/configuration.py @@ -97,7 +97,7 @@ class configuration: self.containers[id].physmem[startend][regionid] = val if regionid + 1 > self.containers[id].phys_regions: self.containers[id].phys_regions = regionid + 1 - elif param[:len("OPT_DIRNAME")] == "OPT_DIRNAME": + elif param[:len("OPT_NAME")] == "OPT_NAME": dirname = val[1:-1].lower() self.containers[id].dirname = dirname self.containers[id].name = dirname