QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/6'

Browse Source 
* qubesos/pr/6:
  udev-block-add-change: simplify a check
  udev-block-add-change: don't exclude already attached devs
  udev-block-add-change: better mount status check
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-16 21:34:17 +02:00
commit 3422cffe0d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
udev/udev-block-add-change
View File

@ -11,6 +11,10 @@ MODE=w
QDB_KEY="/qubes-block-devices/$NAME" QDB_KEY="/qubes-block-devices/$NAME"
xs_remove() { xs_remove() {
if is_attached /sys$DEVPATH; then
return 0
fi
if [ "$QUBES_EXPOSED" == "1" ]; then if [ "$QUBES_EXPOSED" == "1" ]; then
qubesdb-rm "$QDB_KEY/" qubesdb-rm "$QDB_KEY/"
qubesdb-write /qubes-block-devices '' qubesdb-write /qubes-block-devices ''
@ -20,8 +24,8 @@ xs_remove() {
is_used() { is_used() {
local sys_devpath=$1 local sys_devpath=$1
# mounted # mounted; or enabled swap
if fgrep -q $(basename $sys_devpath) /proc/mounts; then if lsblk -dnr -o MOUNTPOINT "$DEVNAME" | grep -q .; then
return 0 return 0
fi fi
# part of other device-mapper # part of other device-mapper
@ -82,11 +86,7 @@ fi
# the same time) # the same time)
for part in /sys$DEVPATH/$NAME*; do for part in /sys$DEVPATH/$NAME*; do
if [ -d $part ]; then if [ -d $part ]; then
if is_used $part; then if is_used $part || is_attached $part; then
xs_remove
exit 0
fi
if is_attached $part; then
xs_remove xs_remove
exit 0 exit 0
fi fi