We could config user namespace for LXC container
in details->overview page.
Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>
---
ui/details.ui | 290 ++++++++++++++++++++++++++++++++++++++++++++++++-
virtManager/details.py | 60 +++++++++-
2 files changed, 343 insertions(+), 7 deletions(-)
diff --git a/ui/details.ui b/ui/details.ui
index 6e330f9..71e4ed8 100644
--- a/ui/details.ui
+++ b/ui/details.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.16.0 on Thu Feb 20 08:33:46 2014 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -26,6 +26,40 @@
<property name="upper">1000000000</property>
<property name="step_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment14">
+ <property name="upper">65536</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment15">
+ <property name="upper">65536</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment16">
+ <property name="upper">65536</property>
+ <property name="value">1000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment17">
+ <property name="upper">65536</property>
+ <property name="value">1000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment18">
+ <property name="upper">65536</property>
+ <property name="value">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment19">
+ <property name="upper">65536</property>
+ <property name="value">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">25</property>
+ </object>
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">1</property>
<property name="upper">10240000</property>
@@ -1004,6 +1038,250 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkExpander" id="config-idmap-expander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">3</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="config-idmap-grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="config-idmap-checkbutton">
+ <property name="label" translatable="yes">Enable User Namespace</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_config_idmap_check_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="idmap-spin-grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">User ID: </property>
+ <property name="max_width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"> Group ID: </property>
+ <property name="max_width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Start</property>
+ <property name="max_width_chars">20</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Target</property>
+ <property name="max_width_chars">20</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Count</property>
+ <property name="max_width_chars">20</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="max_width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="uid-start">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">6</property>
+ <property name="adjustment">adjustment14</property>
+ <property name="climb_rate">1</property>
+ <signal name="changed" handler="on_idmap_uid_start_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="gid-start">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment15</property>
+ <property name="climb_rate">1</property>
+ <signal name="changed" handler="on_idmap_uid_target_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="uid-target">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">6</property>
+ <property name="adjustment">adjustment16</property>
+ <signal name="changed" handler="on_idmap_uid_target_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="gid-target">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment17</property>
+ <signal name="changed" handler="on_idmap_gid_target_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="uid-count">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">6</property>
+ <property name="adjustment">adjustment18</property>
+ <signal name="changed" handler="on_idmap_uid_count_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="gid-count">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment19</property>
+ <signal name="changed" handler="on_idmap_gid_count_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>User Namespace</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -1646,12 +1924,12 @@
<property name="climb_rate">1</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
- <signal name="changed" handler="on_config_vcpus_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-vcpus-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Virtual CPU Select</property>
</object>
</child>
+ <signal name="changed" handler="on_config_vcpus_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2046,12 +2324,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <signal name="changed" handler="on_config_vcpupin_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-vcpupin-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Virtual CPU Affinity Select</property>
</object>
</child>
+ <signal name="changed" handler="on_config_vcpupin_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2280,12 +2558,12 @@
<property name="climb_rate">2</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
- <signal name="changed" handler="on_config_memory_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-memory-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Memory Select</property>
</object>
</child>
+ <signal name="changed" handler="on_config_memory_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2329,12 +2607,12 @@
<property name="climb_rate">2</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
- <signal name="changed" handler="on_config_maxmem_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-maxmem-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Max Memory Select</property>
</object>
</child>
+ <signal name="changed" handler="on_config_maxmem_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/virtManager/details.py b/virtManager/details.py
index 72e79da..e9132b8 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -51,6 +51,7 @@ from virtinst import VirtualRNGDevice
EDIT_TITLE,
EDIT_MACHTYPE,
EDIT_DESC,
+EDIT_IDMAP,
EDIT_VCPUS,
EDIT_CPUSET,
@@ -103,7 +104,7 @@ EDIT_FS,
EDIT_HOSTDEV_ROMBAR,
-) = range(1, 42)
+) = range(1, 43)
# Columns in hw list model
@@ -579,6 +580,13 @@ 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,
"on_config_vcpus_changed": self.config_vcpus_changed,
"on_config_maxvcpus_changed": self.config_maxvcpus_changed,
@@ -1600,6 +1608,16 @@ class vmmDetails(vmmGObjectUI):
if edittype not in self.active_edits:
self.active_edits.append(edittype)
+ # Idmap
+ def config_idmap_enable(self, src):
+ do_enable = src.get_active()
+ self.widget("idmap-spin-grid").set_sensitive(do_enable)
+ self.config_idmap_changed()
+
+ def config_idmap_changed(self, ignore=None):
+ self.enable_apply(EDIT_IDMAP)
+
+
# Memory
def config_get_maxmem(self):
return uiutil.spin_get_helper(self.widget("config-maxmem"))
@@ -1955,6 +1973,23 @@ class vmmDetails(vmmGObjectUI):
add_define(self.vm.define_description, desc)
add_hotplug(self.vm.hotplug_description, desc)
+ 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]
+ else:
+ idmap_list = None
+
+ add_define(self.vm.define_idmap, idmap_list)
+
return self._change_config_helper(df, da, hf, ha)
# CPUs
@@ -2439,6 +2474,29 @@ class vmmDetails(vmmGObjectUI):
if machtype is not None:
uiutil.set_combo_entry(self.widget("machine-type"), machtype)
+ # User namespace idmap setting
+ 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')
+
+ IdMap = self.vm.get_idmap()
+ show_config = IdMap.uid_start is not None
+
+ 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"]
+ for name in Name:
+ IdMap_proper = getattr(IdMap, name.replace("-", "_"))
+ self.widget(name).set_value(int(IdMap_proper))
+
def refresh_inspection_page(self):
inspection_supported = self.config.support_inspection
uiutil.set_grid_row_visible(self.widget("details-overview-error"),
--
1.8.5.3
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
