On Wed, Aug 08, 2012 at 05:59:39PM +0800, Wanlong Gao wrote: > We just remove the process accounting files previously without > touch a empty file, this will cause psacct runs error. > Restart the service can't help us create this file auto. > > couldn't open file '/var/account/pacct': No such file or directory > > Signed-off-by: Wanlong Gao <[email protected]> > --- > po/POTFILES-ml | 1 + > sysprep/Makefile.am | 4 +-- > sysprep/sysprep_operation_logfiles.ml | 1 - > sysprep/sysprep_operation_pacct_log.ml | 60 > ++++++++++++++++++++++++++++++++++ > 4 files changed, 63 insertions(+), 3 deletions(-) > create mode 100644 sysprep/sysprep_operation_pacct_log.ml > > diff --git a/po/POTFILES-ml b/po/POTFILES-ml > index 11aab05..7f75dc8 100644 > --- a/po/POTFILES-ml > +++ b/po/POTFILES-ml > @@ -26,6 +26,7 @@ sysprep/sysprep_operation_lvm_uuids.ml > sysprep/sysprep_operation_machine_id.ml > sysprep/sysprep_operation_mail_spool.ml > sysprep/sysprep_operation_net_hwaddr.ml > +sysprep/sysprep_operation_pacct_log.ml > sysprep/sysprep_operation_package_manager_cache.ml > sysprep/sysprep_operation_pam_data.ml > sysprep/sysprep_operation_puppet_data_log.ml > diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am > index c52a65f..50c6e11 100644 > --- a/sysprep/Makefile.am > +++ b/sysprep/Makefile.am > @@ -42,8 +42,8 @@ operations = \ > abrt_data bash_history blkid_tab ca_certificates cron_spool \ > dhcp_client_state dhcp_server_state dovecot_data flag_reconfiguration \ > hostname kerberos_data lvm_uuids logfiles machine_id mail_spool \ > - net_hwaddr package_manager_cache pam_data puppet_data_log random_seed \ > - rhn_systemid samba_db_log script smolt_uuid ssh_hostkeys \ > + net_hwaddr pacct_log package_manager_cache pam_data puppet_data_log \ > + random_seed rhn_systemid samba_db_log script smolt_uuid ssh_hostkeys \ > ssh_userdir sssd_db_log udev_persistent_net user_account \ > utmp yum_uuid > > diff --git a/sysprep/sysprep_operation_logfiles.ml > b/sysprep/sysprep_operation_logfiles.ml > index 333c317..5e6ce7f 100644 > --- a/sysprep/sysprep_operation_logfiles.ml > +++ b/sysprep/sysprep_operation_logfiles.ml > @@ -54,7 +54,6 @@ let globs = List.sort compare [ > "/var/log/libvirt/uml/*.log"; > "/var/named/data/named.run"; > "/var/log/ppp/connect-errors"; > - "/var/account/pacct"; > "/var/log/setroubleshoot/*.log"; > "/var/log/squid/*.log"; > (* And the status file of logrotate *) > diff --git a/sysprep/sysprep_operation_pacct_log.ml > b/sysprep/sysprep_operation_pacct_log.ml > new file mode 100644 > index 0000000..aebed29 > --- /dev/null > +++ b/sysprep/sysprep_operation_pacct_log.ml > @@ -0,0 +1,60 @@ > +(* 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 pacct_log_perform g root = > + let typ = g#inspect_get_type root in > + let distro = g#inspect_get_distro root in > + match typ, distro with > + | "linux", ("fedora"|"rhel"|"centos"|"scientificlinux"|"redhat-based") -> > + let files = g#glob_expand "/var/account/pacct*" in > + Array.iter ( > + fun file -> > + try g#rm file with G.Error _ -> () > + ) files; > + (try g#touch "/var/account/pacct" with G.Error _ -> ()); > + [ `Created_files ] > + > + | "linux", ("debian"|"ubuntu") -> > + let files = g#glob_expand "/var/log/account/pacct*" in > + Array.iter ( > + fun file -> > + try g#rm file with G.Error _ -> () > + ) files; > + (try g#touch "/var/log/account/pacct" with G.Error _ -> ()); > + [ `Created_files ] > + > + | _ -> [] > + > +let pacct_log_op = { > + name = "pacct-log"; > + enabled_by_default = true; > + heading = s_"Remove the process accounting log files"; > + pod_description = Some (s_"\ > +The system wide process accounting will store to the pacct > +log files if the process accounting is on."); > + extra_args = []; > + perform_on_filesystems = Some pacct_log_perform; > + perform_on_devices = None; > +} > + > +let () = register_operation pacct_log_op > -- > 1.7.12.rc1
Thanks. Applied and will push it shortly. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v _______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
