From 843482e589e3b989e88d892e6d1fca002a5887d2 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 8 Jun 2020 15:17:58 +0200 Subject: [PATCH 1/3] man/checkout: fix short name option of --user-mode The short name option of --user-mode is -U. Signed-off-by: Stefan Agner --- man/ostree-checkout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/ostree-checkout.xml b/man/ostree-checkout.xml index 06385927..8ba1c249 100644 --- a/man/ostree-checkout.xml +++ b/man/ostree-checkout.xml @@ -68,7 +68,7 @@ Boston, MA 02111-1307, USA. - , + , Do not change file ownership or initialize extended attributes. From 832ca09891405f9079124cc9e76941531bb54630 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 8 Jun 2020 15:40:52 +0200 Subject: [PATCH 2/3] checkout: use FILE as option argument string for --skip-list Align with --from-file and use 'FILE' instead of 'PATH' as option argument string. No functional change, this is only cosmetics. Signed-off-by: Stefan Agner --- src/ostree/ot-builtin-checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c index a0fe4be4..813dbb9e 100644 --- a/src/ostree/ot-builtin-checkout.c +++ b/src/ostree/ot-builtin-checkout.c @@ -87,7 +87,7 @@ static GOptionEntry options[] = { { "force-copy-zerosized", 'z', 0, G_OPTION_ARG_NONE, &opt_force_copy_zerosized, "Do not hardlink zero-sized files", NULL }, { "force-copy", 'C', 0, G_OPTION_ARG_NONE, &opt_force_copy, "Never hardlink (but may reflink if available)", NULL }, { "bareuseronly-dirs", 'M', 0, G_OPTION_ARG_NONE, &opt_bareuseronly_dirs, "Suppress mode bits outside of 0775 for directories (suid, world writable, etc.)", NULL }, - { "skip-list", 0, 0, G_OPTION_ARG_FILENAME, &opt_skiplist_file, "File containing list of files to skip", "PATH" }, + { "skip-list", 0, 0, G_OPTION_ARG_FILENAME, &opt_skiplist_file, "File containing list of files to skip", "FILE" }, { "selinux-policy", 0, 0, G_OPTION_ARG_FILENAME, &opt_selinux_policy, "Set SELinux labels based on policy in root filesystem PATH (may be /); implies --force-copy", "PATH" }, { "selinux-prefix", 0, 0, G_OPTION_ARG_STRING, &opt_selinux_prefix, "When setting SELinux labels, prefix all paths by PREFIX", "PREFIX" }, { NULL } From 38aa912a0eff7f555ef3cd05c76edc3641c02dac Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 8 Jun 2020 15:42:38 +0200 Subject: [PATCH 3/3] man/checkout: document missing options Document missing options in the ostree checkout man page. Signed-off-by: Stefan Agner --- man/ostree-checkout.xml | 71 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/man/ostree-checkout.xml b/man/ostree-checkout.xml index 8ba1c249..3956e34f 100644 --- a/man/ostree-checkout.xml +++ b/man/ostree-checkout.xml @@ -108,6 +108,14 @@ Boston, MA 02111-1307, USA. directories. Requires -H. + + + + + Process whiteout files (Docker style). + + + @@ -131,6 +139,69 @@ Boston, MA 02111-1307, USA. Process many checkouts from input file. + + + ="POLICY" + + + POLICY is a boolean which specifies whether fsync should be + used or not. Default to true. + + + + + , + + + + Do not fall back to full copies if hardlinking fails. + + + + + , + + + + Do not hardlink zero-sized files. + + + + + , + + + Never hardlink (but may reflink if available). + + + + + , + + + + Suppress mode bits outside of 0775 for directories (suid, + world writable, etc.). + + + + + ="FILE" + + + Skip checking out the absolute file paths listed in FILE, + one per line. + + + + + + + + Set SELinux labels based on policy in root filesystem PATH + (may be /). This implies --force-copy. + +