diff --git a/installer/installer-sudoers b/installer/installer-sudoers index 6311c21..7ec4890 100644 --- a/installer/installer-sudoers +++ b/installer/installer-sudoers @@ -6,6 +6,6 @@ # # Cmnd alias specification -Cmnd_Alias INSTALLER = /usr/sbin/gparted, /usr/share/openmamba/installer/installer.sh, /usr/bin/udisks +Cmnd_Alias INSTALLER = /usr/sbin/gparted, /usr/share/openmamba/installer/installer.sh, /usr/bin/udisks, /sbin/shutdown %sysadmin ALL = NOPASSWD: INSTALLER diff --git a/installer/installer.kmdr b/installer/installer.kmdr index f5b409b..40ffe99 100755 --- a/installer/installer.kmdr +++ b/installer/installer.kmdr @@ -3462,14 +3462,13 @@ fi - if [ "$DESKTOP_SESSION" == "gnome" ]; then + if [ "$DESKTOP_SESSION" == "gnome" -o "$DESKTOP_SESSION" == "GNOME" ]; then gnome-session-save --shutdown-dialog -elif [ "${DESKTOP_SESSION:0:3}" == "kde" -o "${KDE_FULL_SESSION}" == "true" ]; then - /usr/bin/qdbus org.kde.ksmserver /KSMServer logout 0 1 2 -elif [ "${DESKTOP_SESSION:0:3}" == "kde" ]; then - dcop ksmserver ksmserver logout 0 1 1 -else +elif [ "$DESKTOP_SESSION" == "lxde" -o "$DESKTOP_SESSION" == "LXDE" ]; then shutdown now -r +else +# assume KDE4 as default (or use KDE_FULL_SESSION == true) + /usr/bin/qdbus org.kde.ksmserver /KSMServer logout 0 1 2 fi