[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & gr
From: |
Vincent Legoll |
Subject: |
[bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking. |
Date: |
Sun, 17 May 2020 19:17:05 +0200 |
* etc/guix-install.sh (sys_create_build_user): Use getent instead of id to check
presence of users, use bare getent call with output redirection for group check.
---
etc/guix-install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 225cf532b8..a56e0ec7b2 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -303,7 +303,7 @@ sys_create_build_user()
_debug "--- [ $FUNCNAME ] ---"
- if [ $(getent group guixbuild) ]; then
+ if getent group guixbuild >/dev/null 2>&1; then
_msg "${INF}group guixbuild exists"
else
groupadd --system guixbuild
@@ -311,7 +311,7 @@ sys_create_build_user()
fi
for i in $(seq -w 1 10); do
- if id "guixbuilder${i}" &>/dev/null; then
+ if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then
_msg "${INF}user is already in the system, reset"
usermod -g guixbuild -G guixbuild \
-d /var/empty -s "$(which nologin)" \
--
2.26.2
- [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 07/28] guix-install.sh: Move code in a new function., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 02/28] guix-install.sh: Add xz to requirements., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking.,
Vincent Legoll <=
- [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible with busybox., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v", Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 19/28] Remove &> and >& bashisms, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 21/28] Remove unused variable, Vincent Legoll, 2020/05/17