From 3729bc1fe1726abda7576fdd6243a47ac96de5fe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Sep 2014 16:39:55 +0100 Subject: [PATCH] sysprep: Check --{keep,remove}-user-accounts parameters are not used when operation is disabled (RHBZ#1141157). You will see an error like this: $ virt-sysprep --remove-user-accounts foo,bar -a /dev/null virt-sysprep: error: user-accounts: --remove-user-accounts parameter was used, but the "user-account" operation is not enabled --- sysprep/sysprep_operation_user_account.ml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sysprep/sysprep_operation_user_account.ml b/sysprep/sysprep_operation_user_account.ml index c5142861b..2d231cd1a 100644 --- a/sysprep/sysprep_operation_user_account.ml +++ b/sysprep/sysprep_operation_user_account.ml @@ -134,6 +134,11 @@ This option can be specified multiple times." }; ]; perform_on_filesystems = Some user_account_perform; + not_enabled_check_args = fun () -> + if not (StringSet.is_empty !keep_users) then + error ~prog (f_"user-accounts: --keep-user-accounts parameter was used, but the \"user-account\" operation is not enabled"); + if not (StringSet.is_empty !remove_users) then + error ~prog (f_"user-accounts: --remove-user-accounts parameter was used, but the \"user-account\" operation is not enabled"); } let () = register_operation op