Commit 96b24b6f60f21135c54ffe395679d36a2c81eb5c

Authored by Silvan Calarco
1 parent da4d492339
Exists in master and in 1 other branch milestone2

installer: provide different reboot mechanisms for different desktops

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

installer/installer.kmdr
... ... @@ -3433,10 +3433,14 @@
3433 3433 </property>
3434 3434 <property name="associations" stdset="0">
3435 3435 <stringlist>
3436   - <string>if [ -x /usr/bin/qdbus ]; then
  3436 + <string>if [ "$DESKTOP_SESSION" == "gnome" ]; then
  3437 + gnome-session-save --shutdown-dialog
  3438 +elif [ "${DESKTOP_SESSION:0:3}" == "kde" -a -x /usr/bin/qdbus ]; then
3437 3439 /usr/bin/qdbus org.kde.ksmserver /KSMServer logout 0 1 2
3438   -else
  3440 +elif [ "${DESKTOP_SESSION:0:3}" == "kde" ]; then
3439 3441 dcop ksmserver ksmserver logout 0 1 1
  3442 +else
  3443 + shutdown now -r
3440 3444 fi
3441 3445 </string>
3442 3446 </stringlist>