Skip to content

Commit f307c08

Browse files
committed
[fix] : Fixed GDM not being able to start after installation
1 parent 3daf15d commit f307c08

4 files changed

Lines changed: 117 additions & 1 deletion

File tree

channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ if [[ "${arch}" = "i686" ]]; then
3333
sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}"
3434
done
3535
fi
36+
37+
# Prepare gdm for calamares
38+
if [[ -f "/usr/share/calamares/modules/services.conf" ]]; then
39+
sed -i "s|%DM%|gdm|g" "/usr/share/calamares/modules/services.conf"
40+
fi

modules/calamares/airootfs.any/usr/share/calamares/modules/services-plymouth.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ services:
7777
- name: "org.cups.cupsd"
7878
mandatory: false
7979

80-
- name: "lightdm-plymouth"
80+
- name: "%DM%-plymouth"
8181
mandatory: false
8282

8383
- name: "pacman-init"
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# Systemd services manipulation.
2+
#
3+
# This module can enable services and targets for systemd
4+
# (if packaging doesn't already do that). It can calso
5+
# disable services (but not targets).
6+
#
7+
# First, services are enabled; then targets; then services
8+
# are disabled -- this order of operations is fixed.
9+
---
10+
11+
# There are three configuration keys for this module:
12+
# *services*, *targets* and *disable*. The value of each
13+
# key is a list of entries. Each entry has two keys:
14+
# - *name* is the (string) name of the service or target that is being
15+
# changed. Use quotes. Don't include ".target" or ".service"
16+
# in the name.
17+
# - *mandatory* is a boolean option, which states whether the change
18+
# must be done successfully. If systemd reports an error while changing
19+
# a mandatory entry, the installation will fail. When mandatory is false,
20+
# errors for that entry (service or target) are ignored. If mandatory
21+
# is not specified, the default is false.
22+
#
23+
# An entry may also be given as a single string, which is then
24+
# interpreted as the name of the service. In this case, mandatory
25+
# is also set to the default of false.
26+
#
27+
# Use [] to express an empty list.
28+
29+
# # This example enables NetworkManager (and fails if it can't),
30+
# # disables cups (and ignores failure). Then it enables the
31+
# # graphical target (e.g. so that SDDM runs for login), and
32+
# # finally disables pacman-init (an ArchLinux-only service).
33+
# #
34+
# # Enables <name>.service
35+
# services:
36+
# - name: "NetworkManager"
37+
# mandatory: true
38+
# - name: "cups"
39+
# mandatory: false
40+
#
41+
# # Enables <name>.target
42+
# targets:
43+
# - name: "graphical"
44+
# mandatory: true
45+
#
46+
# # Disables <name>.service
47+
# disable:
48+
# - name: "pacman-init"
49+
# mandatory: false
50+
#
51+
# # Disables <name>.target
52+
# # .. this shows how to use just the name
53+
# disable-targets:
54+
# - graphical
55+
#
56+
# # Masks (stronger version of disable). This section
57+
# # is unusual because you **must** include the suffix
58+
# # (e.g. ".service") as part of the name, so, e.g. to mask
59+
# # NetworkManager (rather than just disable it) you must
60+
# # specify "NetworkManager.service" as name.
61+
# mask:
62+
# - name: "NetworkManager.service"
63+
# - mandatory: true
64+
65+
# By default, no changes are made.
66+
#services: []
67+
#targets: []
68+
#disable: []
69+
disable-targets: []
70+
71+
# Manjaro settings
72+
73+
services:
74+
- name: "NetworkManager"
75+
mandatory: false
76+
77+
- name: "org.cups.cupsd"
78+
mandatory: false
79+
80+
- name: "%DM%-plymouth"
81+
mandatory: false
82+
83+
- name: "pacman-init"
84+
mandatory: false
85+
86+
- name: "tlp"
87+
mandatory: false
88+
89+
- name: "tlp-sleep"
90+
mandatory: false
91+
92+
targets:
93+
- name: "graphical"
94+
mandatory: true
95+
96+
disable:
97+
- name: "dhcpcd"
98+
mandatory: false
99+
100+
mask:
101+
- name: "systemd-rfkill"
102+
mandatory: false
103+
104+
- name: "systemd-rfkill.socket"
105+
mandatory: false

modules/lightdm/airootfs.any/root/customize_airootfs_lightdm.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,9 @@ if [[ -f "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" ]] && cat "/etc
3939
exit 1
4040
fi
4141
fi
42+
43+
44+
# For calamares
45+
if [[ -f "/usr/share/calamares/modules/services.conf" ]]; then
46+
sed -i "s|%DM%|lightdm|g" "/usr/share/calamares/modules/services.conf"
47+
fi

0 commit comments

Comments
 (0)