matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

[explorer/disks] Fix for NetBSD

Browse source 
When connecting over SSH and running /bin/sh, the PATH is missing sbin locations.
sysctl is located at /sbin/sysctl on NetBSD.
This commit is contained in:
Dennis Camera 2020-02-23 22:59:41 +01:00
commit c6aba8d189
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cdist/conf/explorer/disks
View file

@ -1,14 +1,20 @@
#!/bin/sh #!/bin/sh -e
uname_s="$(uname -s)" uname_s="$(uname -s)"
case "${uname_s}" in case $uname_s in
FreeBSD) FreeBSD)
sysctl -n kern.disks sysctl -n kern.disks
;; ;;
OpenBSD|NetBSD) OpenBSD)
sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
;; ;;
NetBSD)
PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
sysctl -n hw.disknames \
| awk 'BEGIN { RS = " " } /^[lsw]d[0-9]+/' \
| xargs
;;
Linux) Linux)
if command -v lsblk > /dev/null if command -v lsblk > /dev/null
then then
@ -23,5 +29,3 @@ case "${uname_s}" in
printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2 printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
;; ;;
esac esac
exit 0