proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 04:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

python: Various fixes to the python scripts

Browse Source 
This fixes a few issues uncovered by the recent C module fix.

In lxc-start-ephemeral, the hwaddr code wasn't actually working.
Replace by code that properly iterates through the network interfaces
and sets a new MAC address for each entry.

In the python overlay, catch the newly emitted KeyError when in
set_config_item (or setting any previously unset variable would fail).

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2013-04-18 22:20:53 +02:00
parent 2ebec36f27
commit 6c5db2af1f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/lxc-start-ephemeral.in
View File

@ -134,7 +134,9 @@ dest = lxc.Container(os.path.basename(dest_path), args.lxcpath)
dest.load_config(orig.config_file_name) dest.load_config(orig.config_file_name)
dest.set_config_item("lxc.utsname", dest.name) dest.set_config_item("lxc.utsname", dest.name)
dest.set_config_item("lxc.rootfs", os.path.join(dest_path, "rootfs")) dest.set_config_item("lxc.rootfs", os.path.join(dest_path, "rootfs"))
dest.set_config_item("lxc.network.hwaddr", randomMAC()) for nic in dest.network:
if hasattr(nic, 'hwaddr'):
nic.hwaddr = randomMAC()
overlay_dirs = [(orig.get_config_item("lxc.rootfs"), "%s/rootfs/" % dest_path)] overlay_dirs = [(orig.get_config_item("lxc.rootfs"), "%s/rootfs/" % dest_path)]

3
src/python-lxc/lxc/__init__.py
View File

@ -412,7 +412,10 @@ class Container(_lxc.Container):
Set a config key to a provided value. Set a config key to a provided value.
The value can be a list for the keys supporting multiple values. The value can be a list for the keys supporting multiple values.
""" """
try:
old_value = self.get_config_item(key) old_value = self.get_config_item(key)
except KeyError:
old_value = None
# Check if it's a list # Check if it's a list
def set_key(key, value): def set_key(key, value):