|
 |
7b180b |
From 10e2f3fc7eef6da4d741f7617e80d028257d9884 Mon Sep 17 00:00:00 2001
|
|
|
7b180b |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
7b180b |
Date: Wed, 25 May 2022 13:06:01 +0200
|
|
|
7b180b |
Subject: [PATCH] update common submodule
|
|
|
7b180b |
|
|
|
7b180b |
Shortlog for 48527b8768d7..f8de5508fe75:
|
|
|
7b180b |
|
|
|
7b180b |
Laszlo Ersek (1):
|
|
|
7b180b |
mlcustomize: refresh generated files
|
|
|
7b180b |
|
|
|
7b180b |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2089748
|
|
|
7b180b |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7b180b |
(cherry picked from commit 273de755dfe7eb0f1e81dc62463c125e8bed0cff)
|
|
|
7b180b |
---
|
|
|
7b180b |
common | 2 +-
|
|
|
7b180b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7b180b |
|
|
|
7b180b |
Submodule common 48527b876..f8de5508f:
|
|
|
7b180b |
diff --git a/common/mlcustomize/customize-options.pod b/common/mlcustomize/customize-options.pod
|
|
|
7b180b |
index a83c80a..8aafacd 100644
|
|
|
7b180b |
--- a/common/mlcustomize/customize-options.pod
|
|
|
7b180b |
+++ b/common/mlcustomize/customize-options.pod
|
|
|
7b180b |
@@ -310,6 +310,10 @@ It cannot delete directories, only regular files.
|
|
|
7b180b |
|
|
|
7b180b |
=back
|
|
|
7b180b |
|
|
|
7b180b |
+=item B<--selinux-relabel>
|
|
|
7b180b |
+
|
|
|
7b180b |
+This is a compatibility option that does nothing.
|
|
|
7b180b |
+
|
|
|
7b180b |
=item B<--sm-attach> SELECTOR
|
|
|
7b180b |
|
|
|
7b180b |
Attach to a pool using C<subscription-manager>.
|
|
|
7b180b |
diff --git a/common/mlcustomize/customize-synopsis.pod b/common/mlcustomize/customize-synopsis.pod
|
|
|
7b180b |
index 2520853..9e2c4b2 100644
|
|
|
7b180b |
--- a/common/mlcustomize/customize-synopsis.pod
|
|
|
7b180b |
+++ b/common/mlcustomize/customize-synopsis.pod
|
|
|
7b180b |
@@ -13,4 +13,4 @@
|
|
|
7b180b |
[--uninstall PKG,PKG..] [--update] [--upload FILE:DEST]
|
|
|
7b180b |
[--write FILE:CONTENT] [--no-logfile]
|
|
|
7b180b |
[--password-crypto md5|sha256|sha512] [--no-selinux-relabel]
|
|
|
7b180b |
- [--sm-credentials SELECTOR]
|
|
|
7b180b |
+ [--selinux-relabel] [--sm-credentials SELECTOR]
|
|
|
7b180b |
diff --git a/common/mlcustomize/customize_cmdline.ml b/common/mlcustomize/customize_cmdline.ml
|
|
|
7b180b |
index 5d404e8..a17bed4 100644
|
|
|
7b180b |
--- a/common/mlcustomize/customize_cmdline.ml
|
|
|
7b180b |
+++ b/common/mlcustomize/customize_cmdline.ml
|
|
|
7b180b |
@@ -111,6 +111,8 @@ and flags = {
|
|
|
7b180b |
(* --password-crypto md5|sha256|sha512 *)
|
|
|
7b180b |
no_selinux_relabel : bool;
|
|
|
7b180b |
(* --no-selinux-relabel *)
|
|
|
7b180b |
+ selinux_relabel_ignored : bool;
|
|
|
7b180b |
+ (* --selinux-relabel *)
|
|
|
7b180b |
sm_credentials : Subscription_manager.sm_credentials option;
|
|
|
7b180b |
(* --sm-credentials SELECTOR *)
|
|
|
7b180b |
}
|
|
|
7b180b |
@@ -122,6 +124,7 @@ let rec argspec () =
|
|
|
7b180b |
let scrub_logfile = ref false in
|
|
|
7b180b |
let password_crypto = ref None in
|
|
|
7b180b |
let no_selinux_relabel = ref false in
|
|
|
7b180b |
+ let selinux_relabel_ignored = ref false in
|
|
|
7b180b |
let sm_credentials = ref None in
|
|
|
7b180b |
|
|
|
7b180b |
let rec get_ops () = {
|
|
|
7b180b |
@@ -132,6 +135,7 @@ let rec argspec () =
|
|
|
7b180b |
scrub_logfile = !scrub_logfile;
|
|
|
7b180b |
password_crypto = !password_crypto;
|
|
|
7b180b |
no_selinux_relabel = !no_selinux_relabel;
|
|
|
7b180b |
+ selinux_relabel_ignored = !selinux_relabel_ignored;
|
|
|
7b180b |
sm_credentials = !sm_credentials;
|
|
|
7b180b |
}
|
|
|
7b180b |
in
|
|
|
7b180b |
@@ -464,6 +468,12 @@ let rec argspec () =
|
|
|
7b180b |
s_"Do not relabel files with correct SELinux labels"
|
|
|
7b180b |
),
|
|
|
7b180b |
None, "Do not attempt to correct the SELinux labels of files in the guest.\n\nIn such guests that support SELinux, customization automatically\nrelabels files so that they have the correct SELinux label. (The\nrelabeling is performed immediately, but if the operation fails,\ncustomization will instead touch F</.autorelabel> on the image to\nschedule a relabel operation for the next time the image boots.) This\noption disables the automatic relabeling.\n\nThe option is a no-op for guests that do not support SELinux.";
|
|
|
7b180b |
+ (
|
|
|
7b180b |
+ [ L"selinux-relabel" ],
|
|
|
7b180b |
+ Getopt.Set selinux_relabel_ignored,
|
|
|
7b180b |
+ s_"Compatibility option doing nothing"
|
|
|
7b180b |
+ ),
|
|
|
7b180b |
+ None, "This is a compatibility option that does nothing.";
|
|
|
7b180b |
(
|
|
|
7b180b |
[ L"sm-credentials" ],
|
|
|
7b180b |
Getopt.String (
|
|
|
7b180b |
diff --git a/common/mlcustomize/customize_cmdline.mli b/common/mlcustomize/customize_cmdline.mli
|
|
|
7b180b |
index 7ee882a..7d14e78 100644
|
|
|
7b180b |
--- a/common/mlcustomize/customize_cmdline.mli
|
|
|
7b180b |
+++ b/common/mlcustomize/customize_cmdline.mli
|
|
|
7b180b |
@@ -103,6 +103,8 @@ and flags = {
|
|
|
7b180b |
(* --password-crypto md5|sha256|sha512 *)
|
|
|
7b180b |
no_selinux_relabel : bool;
|
|
|
7b180b |
(* --no-selinux-relabel *)
|
|
|
7b180b |
+ selinux_relabel_ignored : bool;
|
|
|
7b180b |
+ (* --selinux-relabel *)
|
|
|
7b180b |
sm_credentials : Subscription_manager.sm_credentials option;
|
|
|
7b180b |
(* --sm-credentials SELECTOR *)
|
|
|
7b180b |
}
|
|
|
7b180b |
--
|
|
|
7b180b |
2.31.1
|
|
|
7b180b |
|