From 55008b4c98d53e40209e1285991061aa10fd08e6 Mon Sep 17 00:00:00 2001 From: illiliti Date: Wed, 13 May 2020 19:42:30 +0300 Subject: [PATCH] squash --- device-helper | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/device-helper b/device-helper index 91e726d..43bfd6d 100755 --- a/device-helper +++ b/device-helper @@ -4,7 +4,9 @@ create_symlink() { - sym="$1" + dir="$1"; sym="$2" + + # remove double quotes sym="${sym%\"}" sym="${sym#\"}" sym="${dir}/${sym}" @@ -22,19 +24,10 @@ create_symlink() # avoid race condition while ! blkid "/dev/${dev_name}"; do sleep 1; done - for line in $(blkid "/dev/${dev_name}"); do case "${line%%=*}" in - UUID) - dir=/dev/disk/by-uuid - create_symlink "${line##*=}" - ;; - LABEL) - dir=/dev/disk/by-label - create_symlink "${line##*=}" - ;; - PARTUUID) - dir=/dev/disk/by-partuuid - create_symlink "${line##*=}" - ;; + for line in $(blkid "/dev/${dev_name}"); do case "${line%%=*}" in + UUID) create_symlink /dev/disk/by-uuid "${line##*=}" ;; + LABEL) create_symlink /dev/disk/by-label "${line##*=}" ;; + PARTUUID) create_symlink /dev/disk/by-partuuid "${line##*=}" ;; esac; done [ -e "/sys/block/${dev_name}/dm/name" ] && {