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

uvol: fix emmitting ubus event when removing UBI volume

Browse source 
In case a volume which is down is removed, no ubus event needs to be
fired. Don't try.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-04-26 19:19:10 +01:00
parent 794cf3ac59
commit 816c41b6fc
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/uvol/files/ubi.sh
View file

@ -119,14 +119,14 @@ removevol() {
local voldev=$(getdev "$@") local voldev=$(getdev "$@")
local evdata local evdata
[ "$voldev" ] || return 2 [ "$voldev" ] || return 2
local volnum=${voldev#${ubidev}_}
if vol_is_mode $voldev rw ; then if vol_is_mode $voldev rw ; then
evdata="{\"name\": \"$1\", \"action\": \"down\", \"device\": \"/dev/$voldev\"}" evdata="{\"name\": \"$1\", \"action\": \"down\", \"device\": \"/dev/$voldev\"}"
elif vol_is_mode $voldev ro ; then elif vol_is_mode $voldev ro && [ -e "/dev/ubiblock${voldev:3}" ]; then
evdata="{\"name\": \"$1\", \"action\": \"down\", \"device\": \"/dev/ubiblock${voldev:3}\"}" evdata="{\"name\": \"$1\", \"action\": \"down\", \"device\": \"/dev/ubiblock${voldev:3}\"}"
fi fi
local volnum=${voldev#${ubidev}_}
ubirmvol /dev/$ubidev -n $volnum || return $? ubirmvol /dev/$ubidev -n $volnum || return $?
ubus send block.volume "$evdata" [ "$evdata" ] && ubus send block.volume "$evdata"
} }
activatevol() { activatevol() {

1
utils/uvol/files/uvol
View file

@ -3,6 +3,7 @@
# uvol prototype # uvol prototype
# future development roadmap (aka. to-do): # future development roadmap (aka. to-do):
# * re-implement in C (use libubox, execve lvm/ubi*) # * re-implement in C (use libubox, execve lvm/ubi*)
# * hash to validate volume while writing
# * add atomic batch processing for use by container/package manager # * add atomic batch processing for use by container/package manager
if [ -z "$1" ]; then cat <<EOF if [ -z "$1" ]; then cat <<EOF