Sun May 1 08:10:11 2022 UTC ()
mk/Linux: nologin is in /usr/sbin on debian


(nia)
diff -r1.89 -r1.90 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.89 -r1.90 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2022/05/01 08:03:41 1.89
+++ pkgsrc/mk/platform/Linux.mk 2022/05/01 08:10:11 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Linux.mk,v 1.89 2022/05/01 08:03:41 nia Exp $ 1# $NetBSD: Linux.mk,v 1.90 2022/05/01 08:10:11 nia Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if defined(X11_TYPE) && ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12 12
13TYPE?= type # Shell builtin 13TYPE?= type # Shell builtin
14 14
@@ -18,26 +18,28 @@ SU?= /run/current-system/sw/bin/su @@ -18,26 +18,28 @@ SU?= /run/current-system/sw/bin/su
18USERADD?= /run/current-system/sw/bin/useradd 18USERADD?= /run/current-system/sw/bin/useradd
19GROUPADD?= /run/current-system/sw/bin/groupadd 19GROUPADD?= /run/current-system/sw/bin/groupadd
20NOLOGIN?= /run/current-system/sw/bin/nologin 20NOLOGIN?= /run/current-system/sw/bin/nologin
21.endif 21.endif
22 22
23PS?= /bin/ps 23PS?= /bin/ps
24.if exists(/usr/bin/su) 24.if exists(/usr/bin/su)
25SU?= /usr/bin/su 25SU?= /usr/bin/su
26.else 26.else
27SU?= /bin/su 27SU?= /bin/su
28.endif 28.endif
29.if exists(/sbin/nologin) 29.if exists(/sbin/nologin)
30NOLOGIN?= /sbin/nologin 30NOLOGIN?= /sbin/nologin
 31.elif exists(/usr/sbin/nologin)
 32NOLOGIN?= /usr/sbin/nologin
31.else 33.else
32NOLOGIN?= /bin/false 34NOLOGIN?= /bin/false
33.endif 35.endif
34USERADD?= /usr/sbin/useradd 36USERADD?= /usr/sbin/useradd
35GROUPADD?= /usr/sbin/groupadd 37GROUPADD?= /usr/sbin/groupadd
36 38
37CPP_PRECOMP_FLAGS?= # unset 39CPP_PRECOMP_FLAGS?= # unset
38DEF_UMASK?= 022 40DEF_UMASK?= 022
39DEFAULT_SERIAL_DEVICE?= /dev/null 41DEFAULT_SERIAL_DEVICE?= /dev/null
40EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 42EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
41MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type 43MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type
42PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 44PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
43ROOT_CMD?= ${SU} - root -c 45ROOT_CMD?= ${SU} - root -c