From b0c38476ebc38a39ec85a97044514ab9a0494487 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Jan 2025 13:34:16 +0100 Subject: [PATCH] homectl: move --umask=/--access-mode= help/man sections These don't really have much to do about resource mgmt, but are more about security, hence let's move them away from the resource mgmt section. --- man/homectl.xml | 43 ++++++++++++++++++++++--------------------- src/home/homectl.c | 4 ++-- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/man/homectl.xml b/man/homectl.xml index 243d2b2b81a..e83ca6c62a1 100644 --- a/man/homectl.xml +++ b/man/homectl.xml @@ -334,6 +334,28 @@ + + + + + Takes a UNIX file access mode written in octal. Configures the access mode of the + home directory itself. Note that this is only used when the directory is first created, and the user + may change this any time afterwards. Example: + + + + + + + + + Takes the access mode mask (in octal syntax) to apply to newly created files and + directories of the user ("umask"). If set this controls the initial umask set for all login sessions of + the user, possibly overriding the system's defaults. + + + + @@ -689,27 +711,6 @@ - - - - Takes a UNIX file access mode written in octal. Configures the access mode of the - home directory itself. Note that this is only used when the directory is first created, and the user - may change this any time afterwards. Example: - - - - - - - - - Takes the access mode mask (in octal syntax) to apply to newly created files and - directories of the user ("umask"). If set this controls the initial umask set for all login sessions of - the user, possibly overriding the system's defaults. - - - - diff --git a/src/home/homectl.c b/src/home/homectl.c index a056f831a69..825db583b0f 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -2767,6 +2767,8 @@ static int help(int argc, char *argv[], void *userdata) { " Bounding POSIX capability set\n" " --capability-ambient-set=CAPS\n" " Ambient POSIX capability set\n" + " --access-mode=MODE User home directory access mode\n" + " --umask=MODE Umask for user when logging in\n" " --skel=PATH Skeleton directory to use\n" " --shell=PATH Shell for account\n" " --setenv=VARIABLE[=VALUE] Set an environment variable at log-in\n" @@ -2821,8 +2823,6 @@ static int help(int argc, char *argv[], void *userdata) { " How much time to block password after expiry\n" "\n%4$sResource Management User Record Properties:%5$s\n" " --disk-size=BYTES Size to assign the user on disk\n" - " --access-mode=MODE User home directory access mode\n" - " --umask=MODE Umask for user when logging in\n" " --nice=NICE Nice level for user\n" " --rlimit=LIMIT=VALUE[:VALUE]\n" " Set resource limits\n" -- 2.47.3