Commit 6c3a0b16 authored by Nikos Skalkotos's avatar Nikos Skalkotos

Merge branch 'master' into debian-jessie

parents 932b918f e981232e
2016-09-27, v0.10.1
* Clear /etc/machine-id instead of removing it
2016-07-28, v0.10
* Detect Bitnami images
* Support changing the default "images" container when registering an
......
......@@ -333,15 +333,15 @@ class Linux(Unix):
self.image.g.aug_save()
self.image.g.aug_close()
@sysprep('Removing local machine ID configuration file',
display="Remove local machine ID configuration file")
def _remove_local_machine_id_configuration_file(self):
"""Remove the /etc/machine-id file if present. This file is used by
systemd to uniquelly identify systems and will be created automatically
on the next boot if not present."""
@sysprep('Clearing local machine ID configuration file',
display='Clear local machine ID configuration file')
def _clear_local_machine_id_configuration_file(self):
"""Clear the /etc/machine-id file if present. This file is used by
systemd to uniquelly identify systems and will be automatically
populated on the next boot if empty."""
if self.image.g.is_file('/etc/machine-id'):
self.image.g.rm('/etc/machine-id')
self.image.g.truncate('/etc/machine-id')
def _persistent_grub1(self, new_root):
"""Replaces non-persistent device name occurrences with persistent
......
__version__ = "0.10"
__version__ = "0.10.1"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment