From 316059f47859d5e01cde9b91b5605956a7e3b424 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 28 Nov 2012 01:21:44 +0000 Subject: [PATCH] FreeBSD does not have `/proc/cpuinfo` use `sysctl` in FreeBSD. --- bootstrap-salt-minion.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh index 5440f1d..be6ffad 100755 --- a/bootstrap-salt-minion.sh +++ b/bootstrap-salt-minion.sh @@ -168,7 +168,11 @@ exec 2>$LOGPIPE # DESCRIPTION: Discover hardware information #------------------------------------------------------------------------------- __gather_hardware_info() { - CPU_VENDOR_ID=$(cat /proc/cpuinfo | grep vendor_id | head -n 1 | awk '{print $3}') + if [ -f /proc/cpuinfo ]; then + CPU_VENDOR_ID=$(cat /proc/cpuinfo | grep vendor_id | head -n 1 | awk '{print $3}') + else + CPU_VENDOR_ID=$(sysctl -a | grep hw.model | sed 's|hw.model: ||g') + fi CPU_VENDOR_ID_L=$( echo $CPU_VENDOR_ID | tr '[:upper:]' '[:lower:]' ) CPU_ARCH=$(uname -m 2>/dev/null || uname -p 2>/dev/null || echo "unknown") CPU_ARCH_L=$( echo $CPU_ARCH | tr '[:upper:]' '[:lower:]' )