fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/explorer/netbsd' into 'master'

Browse source 
Fix global explorers for NetBSD

See merge request ungleich-public/cdist!917
This commit is contained in:
poljakowski 2020-07-27 15:29:52 +02:00
commit a6cd767c8f
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cdist/conf/explorer/cpu_cores
View file

@ -33,6 +33,7 @@ case "$os" in
;; ;;
"freebsd"|"netbsd") "freebsd"|"netbsd")
PATH=$(getconf PATH)
sysctl -n hw.ncpu sysctl -n hw.ncpu
;; ;;

5
cdist/conf/explorer/disks
View file

@ -30,9 +30,8 @@ case $uname_s in
sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+'
;; ;;
NetBSD) NetBSD)
PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" PATH=$(getconf PATH)
sysctl -n hw.disknames \ sysctl -n hw.disknames | awk -v RS=' ' '/^[lsw]d[0-9]+/'
| awk 'BEGIN { RS = " " } /^[lsw]d[0-9]+/'
;; ;;
Linux) Linux)
# list of major device numbers toexclude: # list of major device numbers toexclude:

1
cdist/conf/explorer/memory
View file

@ -30,6 +30,7 @@ case "$os" in
;; ;;
*"bsd") *"bsd")
PATH=$(getconf PATH)
echo "$(sysctl -n hw.physmem) / 1048576" | bc echo "$(sysctl -n hw.physmem) / 1048576" | bc
;; ;;