Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uvol: adapt to changes in core

Browse source 
* lvm: remove left-over ubus events
* lvm: resolve /dev/dm-* device name
  As block-mount and blockd now use /dev/dm-* names, let uvol also return
  those device names.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-07-23 22:53:13 +01:00
parent 6379f2a103
commit 9c59eff456
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
utils/uvol/files/lvm.sh
View file

@ -146,9 +146,14 @@ exportlv() {
} }
getdev() { getdev() {
local dms dm_name
existvol "$1" || return 1 existvol "$1" || return 1
exportlv "$1" exportlv "$1"
echo "$lv_dm_path"
for dms in /sys/devices/virtual/block/dm-* ; do
read -r dm_name < "$dms/dm/name"
[ $(basename "$lv_dm_path") = "$dm_name" ] && echo "$(basename "$dms")"
done
} }
getsize() { getsize() {
@ -168,7 +173,6 @@ activatevol() {
[ "$lv_active" = "active" ] && return 0 [ "$lv_active" = "active" ] && return 0
lvm_cmd lvchange -k n "$lv_full_name" || return $? lvm_cmd lvchange -k n "$lv_full_name" || return $?
lvm_cmd lvchange -a y "$lv_full_name" || return $? lvm_cmd lvchange -a y "$lv_full_name" || return $?
ubus send block.volume "{\"name\": \"$1\", \"action\": \"up\", \"mode\": \"${lv_name:0:2}\", \"device\": \"$lv_dm_path\"}"
return 0 return 0
;; ;;
esac esac
@ -186,7 +190,6 @@ disactivatevol() {
[ "$lv_active" = "active" ] || return 0 [ "$lv_active" = "active" ] || return 0
lvm_cmd lvchange -a n "$lv_full_name" || return $? lvm_cmd lvchange -a n "$lv_full_name" || return $?
lvm_cmd lvchange -k y "$lv_full_name" || return $? lvm_cmd lvchange -k y "$lv_full_name" || return $?
ubus send block.volume "{\"name\": \"$1\", \"action\": \"down\", \"mode\": \"${lv_name:0:2}\", \"device\": \"$lv_dm_path\"}"
return 0 return 0
;; ;;
esac esac
@ -308,7 +311,6 @@ boot() {
json_get_vars lv_name lv_dm_path json_get_vars lv_name lv_dm_path
lv_mode="${lv_name:0:2}" lv_mode="${lv_name:0:2}"
lv_name="${lv_name:3}" lv_name="${lv_name:3}"
ubus send block.volume "{\"name\": \"$lv_name\", \"action\": \"up\", \"mode\": \"$lv_mode\", \"device\": \"$lv_dm_path\"}"
json_select .. json_select ..
done done
json_select .. json_select ..