Silvan Calarco
2529743bfc
patch to fix reboot by not using /bin/sh patch to read locale from LANG [release 1.0.1-6mamba;Fri Feb 20 2015]
32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
--- calamares-1.0.1/src/modules/displaymanager/main.py.orig 2015-02-03 22:15:35.000000000 +0100
|
|
+++ calamares-1.0.1/src/modules/displaymanager/main.py 2015-02-20 12:52:59.619944277 +0100
|
|
@@ -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-session'),
|
|
@@ -50,7 +50,9 @@
|
|
return None
|
|
|
|
def have_dm(dm_name, root_mount_point):
|
|
- return os.path.exists("%s/usr/bin/%s" % (root_mount_point, dm_name)) or os.path.exists("%s/usr/sbin/%s" % (root_mount_point, dm_name))
|
|
+ return os.path.exists("%s/usr/bin/%s" % (root_mount_point, dm_name)) \
|
|
+ or os.path.exists("%s/usr/sbin/%s" % (root_mount_point, dm_name)) \
|
|
+ or os.path.exists("%s/opt/kde/bin/%s" % (root_mount_point, dm_name))
|
|
|
|
def set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point):
|
|
""" Enables automatic login for the installed desktop managers """
|
|
@@ -104,7 +106,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")
|
|
+ root_mount_point, "opt/kde/share/config/kdm/kdmrc")
|
|
text = []
|
|
if os.path.exists(kdm_conf_path):
|
|
with open(kdm_conf_path, 'r') as kdm_conf:
|