Libguestfs - Oct 2014 - [PATCH] sysprep: add no-op --no-selinux-relabel (RHBZ#1148072)

Add a no-op --no-selinux-relabel option, to be compatible with
virt-sysprep < 1.26.
---
 sysprep/main.ml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysprep/main.ml b/sysprep/main.ml
index ea94728..f32c4ad 100644
--- a/sysprep/main.ml
+++ b/sysprep/main.ml
@@ -140,6 +140,8 @@ let main ()        "--list-operations", Arg.Unit
list_operations, " " ^ s_"List supported operations";
       "--long-options", Arg.Unit display_long_options, " "
^ s_"List long options";
       "--mount-options", Arg.Set_string mount_opts,
s_"opts" ^ " " ^ s_"Set mount options (eg
/:noatime;/var:rw,noatime)";
+      "--no-selinux-relabel", Arg.Unit (fun () -> ()),
+                                              " " ^
s_"Compatibility option, does nothing";
       "--operation",  Arg.String set_operations, " " ^
s_"Enable/disable specific operations";
       "--operations", Arg.String set_operations, " " ^
s_"Enable/disable specific operations";
       "-q",        Arg.Set quiet,             " " ^
s_"Don't print log messages";
-- 
1.9.3

On Wed, Oct 01, 2014 at 10:16:02AM +0200, Pino Toscano
wrote:
> Add a no-op --no-selinux-relabel option, to be compatible with
> virt-sysprep < 1.26.
> ---
>  sysprep/main.ml | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/sysprep/main.ml b/sysprep/main.ml
> index ea94728..f32c4ad 100644
> --- a/sysprep/main.ml
> +++ b/sysprep/main.ml
> @@ -140,6 +140,8 @@ let main () >        "--list-operations",
Arg.Unit list_operations, " " ^ s_"List supported
operations";
>        "--long-options", Arg.Unit display_long_options, "
" ^ s_"List long options";
>        "--mount-options", Arg.Set_string mount_opts,
s_"opts" ^ " " ^ s_"Set mount options (eg
/:noatime;/var:rw,noatime)";
> +      "--no-selinux-relabel", Arg.Unit (fun () -> ()),
> +                                              " " ^
s_"Compatibility option, does nothing";
>        "--operation",  Arg.String set_operations, " " ^
s_"Enable/disable specific operations";
>        "--operations", Arg.String set_operations, " " ^
s_"Enable/disable specific operations";
>        "-q",        Arg.Set quiet,             " " ^
s_"Don't print log messages";
> -- 
> 1.9.3
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org