diff options
| author | Chen Hanxiao <chenhanxiao@cn.fujitsu.com> | 2014-02-27 10:01:29 +0800 |
|---|---|---|
| committer | Chen Hanxiao <chenhanxiao@cn.fujitsu.com> | 2014-02-27 10:01:29 +0800 |
| commit | 77553c7e49e6660b993dc46c8f2a6cb704c68b20 (patch) | |
| tree | f0a0e7ae7522cdf557bbac3a03426e09cc72ca89 /virtManager | |
| parent | c1e7da72b779d5d1546b0f214dc0d5fc6c1fafc2 (diff) | |
| download | virt-manager-77553c7e49e6660b993dc46c8f2a6cb704c68b20.tar.gz | |
ui: disable setting uid/gid_start for user namespace
Libvirt not allowed uid/gid_start
configured as none 0 or not specified.
This patch will disable config uid/gid_start in UI.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Diffstat (limited to 'virtManager')
| -rw-r--r-- | virtManager/details.py | 12 | ||||
| -rw-r--r-- | virtManager/domain.py | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/virtManager/details.py b/virtManager/details.py index f5330eff..00e011e5 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -580,10 +580,8 @@ class vmmDetails(vmmGObjectUI): "on_overview_name_changed": lambda *x: self.enable_apply(x, EDIT_NAME), "on_overview_title_changed": lambda *x: self.enable_apply(x, EDIT_TITLE), "on_machine_type_changed": lambda *x: self.enable_apply(x, EDIT_MACHTYPE), - "on_idmap_uid_start_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), "on_idmap_uid_target_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), "on_idmap_uid_count_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), - "on_idmap_gid_start_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), "on_idmap_gid_target_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), "on_idmap_gid_count_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP), "on_config_idmap_check_toggled": self.config_idmap_enable, @@ -1976,15 +1974,12 @@ class vmmDetails(vmmGObjectUI): if self.edited(EDIT_IDMAP): enable_idmap = self.widget("config-idmap-checkbutton").get_active() if enable_idmap: - uid_start = self.widget("uid-start").get_text().strip() uid_target = self.widget("uid-target").get_text().strip() uid_count = self.widget("uid-count").get_text().strip() - gid_start = self.widget("gid-start").get_text().strip() gid_target = self.widget("gid-target").get_text().strip() gid_count = self.widget("gid-count").get_text().strip() - idmap_list = [uid_start, uid_target, uid_count, gid_start, - gid_target, gid_count] + idmap_list = [uid_target, uid_count, gid_target, gid_count] else: idmap_list = None @@ -2478,10 +2473,8 @@ class vmmDetails(vmmGObjectUI): is_container = self.vm.is_container() self.widget("config-idmap-expander").set_visible(is_container) - self.widget("uid-start").set_text('0') self.widget("uid-target").set_text('1000') self.widget("uid-count").set_text('10') - self.widget("gid-start").set_text('0') self.widget("gid-target").set_text('1000') self.widget("gid-count").set_text('10') @@ -2491,8 +2484,7 @@ class vmmDetails(vmmGObjectUI): self.widget("config-idmap-checkbutton").set_active(show_config) self.widget("idmap-spin-grid").set_sensitive(show_config) if show_config: - Name = ["uid-start", "uid-target", "uid-count", - "gid-start", "gid-target", "gid-count"] + Name = ["uid-target", "uid-count", "gid-target", "gid-count"] for name in Name: IdMap_proper = getattr(IdMap, name.replace("-", "_")) self.widget(name).set_value(int(IdMap_proper)) diff --git a/virtManager/domain.py b/virtManager/domain.py index db21ae41..6af08ccb 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -577,17 +577,17 @@ class vmmDomain(vmmLibvirtObject): # Idmap config define methods def define_idmap(self, idmap_list): def change(guest): - guest.idmap.uid_start = uid_start + guest.idmap.uid_start = 0 guest.idmap.uid_target = uid_target guest.idmap.uid_count = uid_count - guest.idmap.gid_start = gid_start + guest.idmap.gid_start = 0 guest.idmap.gid_target = gid_target guest.idmap.gid_count = gid_count def clear(guest): guest.idmap.clear() if idmap_list is not None: - (uid_start, uid_target, uid_count, gid_start, - gid_target, gid_count) = idmap_list + (uid_target, uid_count, gid_target, + gid_count) = idmap_list return self._redefine(change) else: return self._redefine(clear) |