toLoongarch/udevil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devmon 1.1.8] fix no error popup on --unmount-removable #42

Browse Source
This commit is contained in:
IgnorantGuru 2015-04-26 10:15:46 -06:00
parent d4eea19ee2
commit e290caa7d9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
0.4.3+ 0.4.3+
udevil.conf use nonempty option for exfat #52 udevil.conf use nonempty option for exfat #52
[devmon 1.1.8] fix no error popup on --unmount-removable #42
0.4.3 2013-12-09: 0.4.3 2013-12-09:
fix default udevil.conf allowed_options missing fmask=0133 #35 fix default udevil.conf allowed_options missing fmask=0133 #35
0.4.2 2013-12-04: 0.4.2 2013-12-04:

8
src/devmon
View File

@ -15,7 +15,7 @@ defaultmountoptions="noexec,nosuid,nodev,noatime"
help() help()
{ {
cat << EOF cat << EOF
devmon version 1.1.7 (distributed with udevil) devmon version 1.1.8 (distributed with udevil)
Automounts and unmounts optical and removable drives Automounts and unmounts optical and removable drives
Requires: udevil bash>=4 Also Recommended: eject spacefm|zenity Requires: udevil bash>=4 Also Recommended: eject spacefm|zenity
Optional: udisks v1 may be substituted for udevil Optional: udisks v1 may be substituted for udevil
@ -580,14 +580,14 @@ mountdev() # $1=device [$2=label] [$3=devtype or fstype]
unmountdev() # $1=device unmountdev() # $1=device
{ {
if [ "$mount_cmd" = "$udisks2" ]; then if [ "$mount_cmd" = "$udisks2" ]; then
uerrmsg=`$mount_cmd unmount -b $1 2>&1`
echo "devmon: $mount_cmd unmount -b $1" echo "devmon: $mount_cmd unmount -b $1"
uerrmsg=`$mount_cmd unmount -b $1 2>&1`
elif [ "$mount_cmd" = "$pmount" ]; then elif [ "$mount_cmd" = "$pmount" ]; then
uerrmsg=`pumount $1 2>&1`
echo "devmon: pumount $1" echo "devmon: pumount $1"
uerrmsg=`pumount $1 2>&1`
else else
uerrmsg=`$mount_cmd --unmount $1 2>&1`
echo "devmon: $mount_cmd --unmount $1" echo "devmon: $mount_cmd --unmount $1"
uerrmsg=`$mount_cmd --unmount $1 2>&1`
fi fi
umounterr="$?" umounterr="$?"
if [ "$mount_cmd" = "$udisks1" ] && [ "$uerrmsg" != "" ]; then if [ "$mount_cmd" = "$udisks1" ] && [ "$uerrmsg" != "" ]; then