Merge branch 'feature/alpine-filesystem' into 'master'

Add Alpine Linux as supported for __filesystem.

See merge request ungleich-public/cdist!925
This commit is contained in:
poljakowski 2020-08-15 21:09:37 +02:00
commit 7b0a4f6831
1 changed files with 4 additions and 4 deletions

View File

@ -18,16 +18,16 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
os=$("$__explorer/os") os=$("${__explorer:?}/os")
if [ -f "$__object/parameter/device" ]; then if [ -f "${__object:?}/parameter/device" ]; then
blkdev="$(cat "$__object/parameter/device")" blkdev="$(cat "$__object/parameter/device")"
else else
blkdev="$__object_id" blkdev="${__object_id:?}"
fi fi
case "$os" in case "$os" in
centos|fedora|redhat|suse|gentoo) alpine|centos|fedora|redhat|suse|gentoo)
if [ ! -x "$(command -v lsblk)" ]; then if [ ! -x "$(command -v lsblk)" ]; then
echo "lsblk is required for __filesystem type" >&2 echo "lsblk is required for __filesystem type" >&2
exit 1 exit 1