Skip to content

scripts: config-lib improve setup_sd_user#1448

Merged
arogge merged 2 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/fix-config-lib-usermod
Jun 12, 2023
Merged

scripts: config-lib improve setup_sd_user#1448
arogge merged 2 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/fix-config-lib-usermod

Conversation

@bruno-at-bareos
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos commented Apr 17, 2023

With the current code, usermod -G .... call is done quoted generating a warning on several distribution when installing bareos-storage package.

Running scriptlet: bareos-storage-22.0.4~pre51.ab585a79e-44.el8.x86_64                                                                                                                                                  19/39
/usr/lib/bareos/scripts/bareos-config-lib.sh: line 370: usermod -G bareos,tape,disk: command not found
Warning: failed: usermod -G bareos,tape,disk bareos

This PR propose to use simpler command construction by calling usermod -a -G group,group in all case.
usermod doesn't failed if the user already belong to the group, and with -a we preserve the already defined group.

  • Use flag -a with -G on usermod command.
  • Remove unneeded code for additional groups.

OP#5450

I propose to also create a backport to 22 for that one.

Result Before

id bareos
uid=988(bareos) gid=984(bareos) groups=984(bareos)

Result After

 id bareos
uid=988(bareos) gid=984(bareos) groups=984(bareos),6(disk),33(tape)

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Check backport line
  • Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really sorry I'm bothering you every time. But you really have a talent for picking the worst shell script that has the most potential for improvement...

- Use flag -a with -G on usermod command.
- Remove unneeded code for additional groups.

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
@bruno-at-bareos bruno-at-bareos force-pushed the dev/bruno/master/fix-config-lib-usermod branch from 042e466 to e3f484f Compare June 12, 2023 09:59
@arogge
Copy link
Member

arogge commented Jun 12, 2023

This looks great! I'll try it and discuss with @pstorz if we should delay 22.1.0 to include this.

@arogge arogge merged commit 2a00976 into bareos:master Jun 12, 2023
@bruno-at-bareos bruno-at-bareos deleted the dev/bruno/master/fix-config-lib-usermod branch January 15, 2024 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments