diff --git a/ChangeLog b/ChangeLog index 1c93ffcc568a5f487ae0c054609772a2371a72ef..bd52afb98672e6b2b7a6cec92c3f2d09ac49afd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +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 diff --git a/image_creator/os_type/linux.py b/image_creator/os_type/linux.py index d32dc56397894ddc2754de5bdfe2ccba09a870c3..6de6b3d95f560fe0d0faee9e5711e5059440d901 100644 --- a/image_creator/os_type/linux.py +++ b/image_creator/os_type/linux.py @@ -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 diff --git a/image_creator/version.py b/image_creator/version.py index dafb47e7a1f2147eb41f38466fc6c02bbe35ee34..60f541e2cbfd2fb096b48601060dddb7bcfa3add 100644 --- a/image_creator/version.py +++ b/image_creator/version.py @@ -1,2 +1,3 @@ -__version__ = "0.10" +__version__ = "0.10.1" + diff --git a/version b/version index 68c123cf10e0a36b6036c9fbc30275960d19e749..571215736a666e8d79d7a7958b5ffc400514fb53 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10 +0.10.1