Fix logout for CLDG

atratsevskiy
parent 76c6d52129
commit cc47f62358

@ -9,17 +9,21 @@ variable_value()
ONLINE_USERS="`variable_value desktop.cl_desktop_online_user`"
if [[ -n $ONLINE_USERS ]]
if [[ -n $ONLINE_USERS ]] || pgrep -f 'xdm/xdm --logout' &>/dev/null
then
ebegin "Logout users"
for user_disp in $(variable_value desktop.cl_desktop_online_data | sed -r "s/;/ /g")
do
user=$(echo $user_disp | cut -d, -f1)
disp=$(echo $user_disp | cut -d, -f2)
/usr/sbin/cl-core --method desktop_logout $user &>/dev/null
/usr/bin/sessreg -d -l :$disp $user &>/dev/null
USER="$user" /usr/share/calculate/xdm/xdm --logout &>/dev/null &
done
if [[ -n $ONLINE_USERS ]]
then
ebegin "Logout users"
for user_disp in $(variable_value desktop.cl_desktop_online_data | sed -r "s/;/ /g")
do
user=$(echo $user_disp | cut -d, -f1)
disp=$(echo $user_disp | cut -d, -f2)
/usr/sbin/cl-core --method desktop_logout $user &>/dev/null
/usr/bin/sessreg -d -l :$disp $user &>/dev/null
USER="$user" /usr/share/calculate/xdm/xdm --logout &>/dev/null &
done
eend 0
fi
if pgrep -f 'xdm/xdm --logout' &>/dev/null
then
ebegin "Please wait for complete logout"
@ -34,5 +38,4 @@ then
done
eend 0
fi
eend 0
fi

Loading…
Cancel
Save