matze/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[explorer] disks: use echo instead of find as fallback

Browse source 
Fixes #761
This commit is contained in:
Nico Schottelius 2019-04-17 20:50:39 +02:00
parent e997e98a73
commit aba1ae68f0
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cdist/conf/explorer/disks
View file

@ -16,15 +16,12 @@ case "$os" in
# hopefully everything else is linux # hopefully everything else is linux
if command -v lsblk > /dev/null if command -v lsblk > /dev/null
then then
# exclude ram disks, floppies and cdroms # exclude ram disks, floppies and cdroms
# https://www.kernel.org/doc/Documentation/admin-guide/devices.txt # https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
lsblk -e 1,2,11 -dno name | xargs lsblk -e 1,2,11 -dno name | xargs
else else
# fallback # fallback
find /dev \ cd /dev && echo [vsh]d?
-type b \
-regex '/dev/\(hd\|sd\|vd\)[a-z]+' \
-printf '%f '
fi fi
;; ;;
esac esac