On Thu, May 10, 2012 at 11:18:22PM +0800, Wanlong Gao wrote: > Remove blkid tab cache in the guest. > > Signed-off-by: Wanlong Gao <[email protected]> > --- > sysprep/Makefile.am | 2 ++ > sysprep/sysprep_operation_blkid_tab.ml | 55 > ++++++++++++++++++++++++++++++++ > 2 files changed, 57 insertions(+) > create mode 100644 sysprep/sysprep_operation_blkid_tab.ml > > diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am > index d82e5ae..ff67f66 100644 > --- a/sysprep/Makefile.am > +++ b/sysprep/Makefile.am > @@ -35,6 +35,7 @@ SOURCES = \ > sysprep_operation.ml \ > sysprep_operation.mli \ > sysprep_operation_bash_history.ml \ > + sysprep_operation_blkid_tab.ml \ > sysprep_operation_cron_spool.ml \ > sysprep_operation_dhcp_client_state.ml \ > sysprep_operation_dhcp_server_state.ml \ > @@ -68,6 +69,7 @@ OBJECTS = \ > utils.cmx \ > sysprep_operation.cmx \ > sysprep_operation_bash_history.cmx \ > + sysprep_operation_blkid_tab.cmx \ > sysprep_operation_cron_spool.cmx \ > sysprep_operation_dhcp_client_state.cmx \ > sysprep_operation_dhcp_server_state.cmx \ > diff --git a/sysprep/sysprep_operation_blkid_tab.ml > b/sysprep/sysprep_operation_blkid_tab.ml > new file mode 100644 > index 0000000..30bd9a7 > --- /dev/null > +++ b/sysprep/sysprep_operation_blkid_tab.ml > @@ -0,0 +1,55 @@ > +(* 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 blkid_tab_perform g root = > + let typ = g#inspect_get_type root in > + if typ <> "windows" then ( > + let files = [ "/var/run/blkid.tab"; > + "/var/run/blkid.tab.old"; > + "/etc/blkid/blkid.tab"; > + "/etc/blkid/blkid.tab.old"; > + "/etc/blkid.tab"; > + "/etc/blkid.tab.old"; > + "/dev/.blkid.tab"; > + "/dev/.blkid.tab.old"; ] in > + List.iter ( > + fun file -> > + if not (g#is_symlink file) then ( > + try g#rm file with G.Error _ -> () > + ) > + ) files; > + > + [] > + ) > + else [] > + > +let blkid_tab_op = { > + name = "blkid-tab"; > + enabled_by_default = true; > + heading = s_"Remove blkid tab in the guest"; > + pod_description = None; > + extra_args = []; > + perform = blkid_tab_perform; > +} > + > +let () = register_operation blkid_tab_op > -- > 1.7.10
Looks fine. I'll push it shortly, thanks! Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/ _______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
