Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com&gt; --- sysprep/sysprep_operation_logfiles.ml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sysprep/sysprep_operation_logfiles.ml b/sysprep/sysprep_operation_logfiles.ml index a8b24f1..8994af9 100644 --- a/sysprep/sysprep_operation_logfiles.ml +++ b/sysprep/sysprep_operation_logfiles.ml @@ -85,6 +85,9 @@ let globs = List.sort compare [ (* log file of gdm *) "/var/log/gdm/*"; + + (* log file of ntp *) + "/var/log/ntpstats/*"; ] let globs_as_pod = String.concat "\n" (List.map ((^) " ") globs)

If we do not want to keep the original iptables rules, enable this operation to remove the iptables rules automatically. Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com&gt; --- sysprep/Makefile.am | 1 + sysprep/sysprep_operation_iptables.ml | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sysprep/sysprep_operation_iptables.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index ec6c2bc..3da99c1 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -43,6 +43,7 @@ operations = \ firstboot \ fs_uuids \ hostname \ + iptables \ kerberos_data \ lvm_uuids \ logfiles \ diff --git a/sysprep/sysprep_operation_iptables.ml b/sysprep/sysprep_operation_iptables.ml new file mode 100644 index 0000000..e36a005 --- /dev/null +++ b/sysprep/sysprep_operation_iptables.ml @@ -0,0 +1,45 @@ +(* virt-sysprep + * Copyright (C) 2013 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 Common_gettext.Gettext + +module G = Guestfs + +let iptables_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let path = "/etc/sysconfig/iptables" in + (try g#rm path with G.Error _ -> ()); + [] + ) + else [] + +let op = { + defaults with + name = "iptables"; + enabled_by_default = false; + heading = s_"Remove the iptables rules"; + pod_description = Some (s_"\ +The custom iptables rules will be stored in /etc/sysconfig/iptables, +if you do not want to keep these iptables rules, enable this operation +to remove it automatically."); + perform_on_filesystems = Some iptables_perform; +} + +let () = register_operation op -- 1.8.4.27.g0a41de8