sysprep: remove the local machine ID

remove the local machine ID, leave it empty, let it be generated
during next booting.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>

RWMJ:
 - Whitespace change.
 - Remove completed items from TODO.

4 files changed, 50 insertions, 3 deletions

diff --git a/TODO b/TODO
index a2dd74f3..a097cad8 100644
--- a/TODO
+++ b/TODO
@@ -399,12 +399,9 @@ virt-sysprep ideas
 
 Kazuo Moriwaka adds:
 
- - /etc/machine-id (created by systemd)
  - "yum clean all" (or the equivalent) to remove yum caches
  - lvm PV and VG have its UUID.  'pvchange -u' and 'vgchange -u' generate
    new UUID (causes trouble with clustered LVM).
- - ABRT have crash report and core dumps under /var/spool/abrt. This can
-   be deleted.
  - swap devices (both of block device and file) should be wiped. This may  
    good for security purpose, and size.  I found virt-sparsify can clear
    swap partition.
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 1622bf2b..b2c15a10 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -22,6 +22,7 @@ sysprep/sysprep_operation_flag_reconfiguration.ml
 sysprep/sysprep_operation_hostname.ml
 sysprep/sysprep_operation_kerberos_data.ml
 sysprep/sysprep_operation_logfiles.ml
+sysprep/sysprep_operation_machine_id.ml
 sysprep/sysprep_operation_mail_spool.ml
 sysprep/sysprep_operation_net_hwaddr.ml
 sysprep/sysprep_operation_package_manager_cache.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index c82e4f83..175f6b4f 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -55,6 +55,7 @@ SOURCES = \
 	sysprep_operation_hostname.ml \
 	sysprep_operation_kerberos_data.ml \
 	sysprep_operation_logfiles.ml \
+	sysprep_operation_machine_id.ml \
 	sysprep_operation_mail_spool.ml \
 	sysprep_operation_net_hwaddr.ml \
 	sysprep_operation_package_manager_cache.ml \
@@ -94,6 +95,7 @@ OBJECTS = \
 	sysprep_operation_hostname.cmx \
 	sysprep_operation_kerberos_data.cmx \
 	sysprep_operation_logfiles.cmx \
+	sysprep_operation_machine_id.cmx \
 	sysprep_operation_mail_spool.cmx \
 	sysprep_operation_net_hwaddr.cmx \
 	sysprep_operation_package_manager_cache.cmx \
diff --git a/sysprep/sysprep_operation_machine_id.ml b/sysprep/sysprep_operation_machine_id.ml
new file mode 100644
index 00000000..4fc0fe53
--- /dev/null
+++ b/sysprep/sysprep_operation_machine_id.ml
@@ -0,0 +1,47 @@
+(* virt-sysprep
+ * Copyright (C) 2012 Fujitsu Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Sysprep_operation
+open Sysprep_gettext.Gettext
+
+module G = Guestfs
+
+let machine_id_perform g root =
+  let typ = g#inspect_get_type root in
+  if typ <> "windows" then (
+    let path = "/etc/machine-id" in
+    (try g#rm path with G.Error _ -> ());
+    (try g#touch path with G.Error _ -> ());
+    []
+  )
+  else []
+
+let machine_id_op = {
+  name = "machine-id";
+  enabled_by_default = true;
+  heading = s_"Remove the local machine ID";
+  pod_description = Some (s_"\
+The machine ID is usually generated from a random source during system
+installation and stays constant for all subsequent boots.  Optionally,
+for stateless systems it is generated during runtime at boot if it is
+found to be empty.");
+  extra_args = [];
+  perform = machine_id_perform;
+}
+
+let () = register_operation machine_id_op