Fri Oct 11 11:56:07 2019 UTC ()
rc.subr: which is not present in Arch Linux boostrap


(triaxx)
diff -r1.15 -r1.16 pkgsrc/pkgtools/rc.subr/files/rc.subr
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/rc.subr/files/rc.subr (expand / switch to unified diff)

--- pkgsrc/pkgtools/rc.subr/files/rc.subr 2018/12/26 00:29:07 1.15
+++ pkgsrc/pkgtools/rc.subr/files/rc.subr 2019/10/11 11:56:06 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rc.subr,v 1.15 2018/12/26 00:29:07 schmonz Exp $ 1# $NetBSD: rc.subr,v 1.16 2019/10/11 11:56:06 triaxx Exp $
2# 2#
3# Copyright (c) 1997-2002 The NetBSD Foundation, Inc. 3# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Luke Mewburn. 7# by Luke Mewburn.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -115,27 +115,29 @@ case $_osname in @@ -115,27 +115,29 @@ case $_osname in
115 _RCCMD_sh="/sbin/sh" 115 _RCCMD_sh="/sbin/sh"
116 _RCCMD_su="/sbin/su" 116 _RCCMD_su="/sbin/su"
117# _RCCMD_systrace="/bin/systrace" # not in IRIX 117# _RCCMD_systrace="/bin/systrace" # not in IRIX
118 _RCCMD_whoami="/bin/whoami" 118 _RCCMD_whoami="/bin/whoami"
119 _RCARG_psformat="-o pid,comm=12345678901234567890" 119 _RCARG_psformat="-o pid,comm=12345678901234567890"
120 # widen column to try to get full command-name 120 # widen column to try to get full command-name
121 _RCARG_ps="-ef" 121 _RCARG_ps="-ef"
122 _RCARG_su="" 122 _RCARG_su=""
123 ;; 123 ;;
124 Linux) 124 Linux)
125 _RCCMD_chown="/bin/chown" 125 _RCCMD_chown="/bin/chown"
126# _RCCMD_ci="/usr/bin/ci" # not in Slackware 8.1 126# _RCCMD_ci="/usr/bin/ci" # not in Slackware 8.1
127# _RCCMD_co="/usr/bin/co" # not in Slackware 8.1 127# _RCCMD_co="/usr/bin/co" # not in Slackware 8.1
128 _RCCMD_nice=$(which nice) 128 if [ ! -f /etc/arch-release ] ; then # which not in Arch
 129 _RCCMD_nice=$(which nice)
 130 fi
129# _RCCMD_rcs="/usr/bin/rcs" # not in Slackware 8.1 131# _RCCMD_rcs="/usr/bin/rcs" # not in Slackware 8.1
130# _RCCMD_systrace="/bin/systrace" # not in Slackware 8.1 132# _RCCMD_systrace="/bin/systrace" # not in Slackware 8.1
131 _RCARG_ps="ax" 133 _RCARG_ps="ax"
132 if [ -e /etc/redhat-release ]; then 134 if [ -e /etc/redhat-release ]; then
133 _RCCMD_su="/bin/su" # for CentOS/RHEL 135 _RCCMD_su="/bin/su" # for CentOS/RHEL
134 fi 136 fi
135 ;; 137 ;;
136 QNX) 138 QNX)
137 _RCCMD_chown="/bin/chown" 139 _RCCMD_chown="/bin/chown"
138# _RCCMD_ci="/usr/bin/ci" # not in QNX 140# _RCCMD_ci="/usr/bin/ci" # not in QNX
139# _RCCMD_co="/usr/bin/co" # not in QNX 141# _RCCMD_co="/usr/bin/co" # not in QNX
140# _RCCMD_systrace="/bin/systrace" # not in QNX 142# _RCCMD_systrace="/bin/systrace" # not in QNX
141 _RCCMD_whoami="/usr/bin/id -un" 143 _RCCMD_whoami="/usr/bin/id -un"