calamares/calamares-1.1.2-displaymanager_fix_paths_openmamba.patch

31 lines
1.4 KiB
Diff

--- calamares-1.1.2.orig/src/modules/displaymanager/main.py 2015-08-10 16:20:20.000000000 +0200
+++ calamares-1.1.2/src/modules/displaymanager/main.py 2015-08-13 09:15:44.573602915 +0200
@@ -30,7 +30,7 @@
desktop_environments = [
DesktopEnvironment('/usr/bin/startkde', 'plasma'), # KDE Plasma 5
- DesktopEnvironment('/usr/bin/startkde', 'kde-plasma'), # KDE Plasma 4
+ DesktopEnvironment('/opt/kde/bin/startkde', 'kde-plasma'), # KDE Plasma 4
DesktopEnvironment('/usr/bin/gnome-session', 'gnome'),
DesktopEnvironment('/usr/bin/startxfce4', 'xfce'),
DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'),
@@ -72,7 +72,8 @@
"""
return os.path.exists(
"{!s}/usr/bin/{!s}".format(root_mount_point, dm_name)) or os.path.exists(
- "{!s}/usr/sbin/{!s}".format(root_mount_point, dm_name))
+ "{!s}/usr/sbin/{!s}".format(root_mount_point, dm_name)) or os.path.exists(
+ "{!s}/opt/kde/bin/{!s}".format(root_mount_point, dm_name))
def set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point):
@@ -156,7 +157,7 @@
if "kdm" in displaymanagers:
# Systems with KDM as Desktop Manager
- kdm_conf_path = os.path.join(root_mount_point, "usr/share/config/kdm/kdmrc")
+ kdm_conf_path = os.path.join(root_mount_point, "opt/kde/share/config/kdm/kdmrc")
text = []
if os.path.exists(kdm_conf_path):