From 0fc64a951c5d8a3394fc2ac8aa1ae0f52402b56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=A9ri?= Date: Tue, 19 Mar 2019 23:09:01 +0100 Subject: [PATCH 1/2] explorer/cpu_cores: Add support for OpenBSD --- cdist/conf/explorer/cpu_cores | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores index 27cc6800..a52bddac 100755 --- a/cdist/conf/explorer/cpu_cores +++ b/cdist/conf/explorer/cpu_cores @@ -28,6 +28,10 @@ case "$os" in sysctl -n hw.physicalcpu ;; + "openbsd") + sysctl -n hw.ncpuonline + ;; + *) if [ -r /proc/cpuinfo ]; then cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)" From dbcf7d55432c90bb6be4547d6e49a1e060279a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=A9ri?= Date: Tue, 19 Mar 2019 23:13:24 +0100 Subject: [PATCH 2/2] explorer/disks: Add support for OpenBSD --- cdist/conf/explorer/disks | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cdist/conf/explorer/disks b/cdist/conf/explorer/disks index 7c60b17a..1780e6d2 100755 --- a/cdist/conf/explorer/disks +++ b/cdist/conf/explorer/disks @@ -1,3 +1,16 @@ -#!/bin/sh -cd /dev || exit 0 -echo sd? hd? vd? +#!/bin/sh -e + +os=$("$__explorer/os") +case "$os" in + openbsd) + IFS=',' disks=$(sysctl -n hw.disknames) + for d in $disks; do + echo "${d%%:*}" + done | sed -n '/^[sw]d[0-9][0-9]*/p' + ;; + + *) + cd /dev || exit 0 + echo sd? hd? vd? + ;; +esac