Libguestfs - Jul 2012 - [PATCH 1/2] sysprep: remove the auto generated abrt data

remove the automatically generated abrt data.

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 po/POTFILES-ml                         |  1 +
 sysprep/Makefile.am                    |  2 ++
 sysprep/sysprep_operation_abrt_data.ml | 47 ++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 sysprep/sysprep_operation_abrt_data.ml

diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 0adfb8e..1622bf2 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -10,6 +10,7 @@ sparsify/utils.ml
 sysprep/main.ml
 sysprep/sysprep_gettext.ml
 sysprep/sysprep_operation.ml
+sysprep/sysprep_operation_abrt_data.ml
 sysprep/sysprep_operation_bash_history.ml
 sysprep/sysprep_operation_blkid_tab.ml
 sysprep/sysprep_operation_ca_certificates.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index 8c4081a..c82e4f8 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -43,6 +43,7 @@ SOURCES = \
 	sysprep_gettext.ml \
 	sysprep_operation.ml \
 	sysprep_operation.mli \
+	sysprep_operation_abrt_data.ml \
 	sysprep_operation_bash_history.ml \
 	sysprep_operation_blkid_tab.ml \
 	sysprep_operation_ca_certificates.ml \
@@ -81,6 +82,7 @@ OBJECTS = \
 	sysprep_gettext.cmx \
 	utils.cmx \
 	sysprep_operation.cmx \
+	sysprep_operation_abrt_data.cmx \
 	sysprep_operation_bash_history.cmx \
 	sysprep_operation_blkid_tab.cmx \
 	sysprep_operation_ca_certificates.cmx \
diff --git a/sysprep/sysprep_operation_abrt_data.ml
b/sysprep/sysprep_operation_abrt_data.ml
new file mode 100644
index 0000000..f3fe0e9
--- /dev/null
+++ b/sysprep/sysprep_operation_abrt_data.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 abrt_data_perform g root +  let typ = g#inspect_get_type root in
+  if typ <> "windows" then (
+    let paths = g#glob_expand "/var/spool/abrt/*" in
+    Array.iter (
+      fun path -> g#rm_rf path;
+    ) paths;
+    g#rm_rf "/root/.ssh";
+    []
+  )
+  else []
+
+let abrt_data_op = {
+  name = "abrt-data";
+  enabled_by_default = true;
+  heading = s_"Remove the crash data generated by ABRT";
+  pod_description = Some (s_"\
+Remove the automatically generated crash data in /var/spool/abrt/
+by ABRT.");
+  extra_args = [];
+  perform = abrt_data_perform;
+}
+
+let () = register_operation abrt_data_op
-- 
1.7.12.rc0

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

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 po/POTFILES-ml                          |  1 +
 sysprep/Makefile.am                     |  2 ++
 sysprep/sysprep_operation_machine_id.ml | 47 +++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 sysprep/sysprep_operation_machine_id.ml

diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 1622bf2..b2c15a1 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 c82e4f8..175f6b4 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 0000000..5e76f04
--- /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
-- 
1.7.12.rc0

Thanks, I pushed them both.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw