Wanlong Gao
2012-Apr-23 08:41 UTC
[Libguestfs] [PATCH] sysprep: flag the system for reconfiguration
Flag the system for reconfiguration by touching /.unconfigured . Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- TODO | 2 - sysprep/Makefile.am | 2 + sysprep/sysprep_operation_flag_reconfiguration.ml | 42 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 sysprep/sysprep_operation_flag_reconfiguration.ml diff --git a/TODO b/TODO index 426d9ff..8cc0543 100644 --- a/TODO +++ b/TODO @@ -373,11 +373,9 @@ Return libosinfo mappings from inspection API. virt-sysprep ideas ------------------ - - touch /.unconfigured ? - other Spacewalk / RHN IDs (?) - Kerberos keys - Puppet registration - - user accounts - Windows sysprep (see: https://github.com/clalancette/oz/blob/e74ce83283d468fd987583d6837b441608e5f8f0/oz/Windows.py ) - blue skies: change the background image diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index f51fc07..71669b2 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -37,6 +37,7 @@ SOURCES = \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ + sysprep_operation_flag_reconfiguration.ml \ sysprep_operation_hostname.ml \ sysprep_operation_logfiles.ml \ sysprep_operation_mail_spool.ml \ @@ -62,6 +63,7 @@ OBJECTS = \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ + sysprep_operation_flag_reconfiguration.ml \ sysprep_operation_hostname.cmx \ sysprep_operation_logfiles.cmx \ sysprep_operation_mail_spool.cmx \ diff --git a/sysprep/sysprep_operation_flag_reconfiguration.ml b/sysprep/sysprep_operation_flag_reconfiguration.ml new file mode 100644 index 0000000..2a26c21 --- /dev/null +++ b/sysprep/sysprep_operation_flag_reconfiguration.ml @@ -0,0 +1,42 @@ +(* 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 + +module G = Guestfs + +let flag_reconfiguration g root + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + g#touch "/.unconfigured"; + [ `Created_files ] + ) + else [] + +let flag_reconfiguration_op = { + name = "flag-reconfiguration"; + enabled_by_default = true; + heading = "Flag the system for reconfiguration"; + pod_description = Some "\ +Flag the system for reconfiguration by touching a file +\"/.unconfigured\"."; + extra_args = []; + perform = flag_reconfiguration; +} + +let () = register_operation flag_reconfiguration_op; -- 1.7.10
Richard W.M. Jones
2012-Apr-23 08:54 UTC
[Libguestfs] [PATCH] sysprep: flag the system for reconfiguration
On Mon, Apr 23, 2012 at 04:41:51PM +0800, Wanlong Gao wrote:> Flag the system for reconfiguration by touching /.unconfigured . > > Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> > --- > TODO | 2 - > sysprep/Makefile.am | 2 + > sysprep/sysprep_operation_flag_reconfiguration.ml | 42 +++++++++++++++++++++ > 3 files changed, 44 insertions(+), 2 deletions(-) > create mode 100644 sysprep/sysprep_operation_flag_reconfiguration.ml > > diff --git a/TODO b/TODO > index 426d9ff..8cc0543 100644 > --- a/TODO > +++ b/TODO > @@ -373,11 +373,9 @@ Return libosinfo mappings from inspection API. > virt-sysprep ideas > ------------------ > > - - touch /.unconfigured ? > - other Spacewalk / RHN IDs (?) > - Kerberos keys > - Puppet registration > - - user accounts > - Windows sysprep > (see: https://github.com/clalancette/oz/blob/e74ce83283d468fd987583d6837b441608e5f8f0/oz/Windows.py ) > - blue skies: change the background image > diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am > index f51fc07..71669b2 100644 > --- a/sysprep/Makefile.am > +++ b/sysprep/Makefile.am > @@ -37,6 +37,7 @@ SOURCES = \ > sysprep_operation_cron_spool.ml \ > sysprep_operation_dhcp_client_state.ml \ > sysprep_operation_dhcp_server_state.ml \ > + sysprep_operation_flag_reconfiguration.ml \ > sysprep_operation_hostname.ml \ > sysprep_operation_logfiles.ml \ > sysprep_operation_mail_spool.ml \ > @@ -62,6 +63,7 @@ OBJECTS = \ > sysprep_operation_cron_spool.cmx \ > sysprep_operation_dhcp_client_state.cmx \ > sysprep_operation_dhcp_server_state.cmx \ > + sysprep_operation_flag_reconfiguration.ml \ > sysprep_operation_hostname.cmx \ > sysprep_operation_logfiles.cmx \ > sysprep_operation_mail_spool.cmx \ > diff --git a/sysprep/sysprep_operation_flag_reconfiguration.ml b/sysprep/sysprep_operation_flag_reconfiguration.ml > new file mode 100644 > index 0000000..2a26c21 > --- /dev/null > +++ b/sysprep/sysprep_operation_flag_reconfiguration.ml > @@ -0,0 +1,42 @@ > +(* 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 > + > +module G = Guestfs > + > +let flag_reconfiguration g root > + let typ = g#inspect_get_type root in > + if typ <> "windows" then ( > + g#touch "/.unconfigured"; > + [ `Created_files ] > + ) > + else [] > + > +let flag_reconfiguration_op = { > + name = "flag-reconfiguration"; > + enabled_by_default = true; > + heading = "Flag the system for reconfiguration"; > + pod_description = Some "\ > +Flag the system for reconfiguration by touching a file > +\"/.unconfigured\"."; > + extra_args = []; > + perform = flag_reconfiguration; > +} > + > +let () = register_operation flag_reconfiguration_op; > -- > 1.7.10ACK. I'll push this later today. 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
Richard W.M. Jones
2012-Apr-23 14:40 UTC
[Libguestfs] [PATCH] sysprep: flag the system for reconfiguration
I have pushed both upstream, thanks for your contribution. Note that I made some changes: Augeas can write to configuration files as well as reading them :-) 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/
Apparently Analagous Threads
- [PATCH 1/2] sysprep: Update comments.
- [PATCH] sysprep: remove kerberos data in the guest
- [PATCH 1/2] sysprep: remove the logfiles configured by logrotate
- [PATCH] virt-sysprep:add logging feature
- Re: [PATCH 2/5] Make sure every *.ml file has a corresponding *.mli file.