CVS commit: pkgsrc/bootstrap

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Apr 23 07:38:14 UTC 2024

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Support Linux setups without groups(1), whoami(1)

Allows initial support for OpenWRT.

from Saulius Krasuckas via tech-pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.323 pkgsrc/bootstrap/bootstrap:1.324
--- pkgsrc/bootstrap/bootstrap:1.323    Fri Mar 22 23:34:00 2024
+++ pkgsrc/bootstrap/bootstrap  Tue Apr 23 07:38:14 2024
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.323 2024/03/22 23:34:00 gutteridge Exp $
+# $NetBSD: bootstrap,v 1.324 2024/04/23 07:38:14 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -749,6 +749,13 @@ Linux)
                need_awk=yes
                need_sed=yes
        fi
+       # Some distros, eg. OpenWRT provide no groups(1), whoami(1) by default:
+       if ! groups >/dev/null 2>&1; then
+               groupsprog="id -gn"
+       fi
+       if ! whoami >/dev/null 2>&1; then
+               whoamiprog="id -un"
+       fi
        machine_arch=`uname -m`
        # Override machine_arch where required.
        case "$machine_arch" in