OSDN Git Service

[fix] : Fixed GDM not being able to start after installation
authorhayao <hayao@fascode.net>
Mon, 23 Aug 2021 06:38:33 +0000 (15:38 +0900)
committerhayao <hayao@fascode.net>
Mon, 23 Aug 2021 06:38:33 +0000 (15:38 +0900)
channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh
modules/calamares/airootfs.any/usr/share/calamares/modules/services-plymouth.conf
modules/calamares/airootfs.any/usr/share/calamares/modules/services.conf [new file with mode: 0644]
modules/lightdm/airootfs.any/root/customize_airootfs_lightdm.sh

index e1c5b26..0576fc2 100755 (executable)
@@ -33,3 +33,8 @@ if [[ "${arch}" = "i686" ]]; then
         sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}"
     done
 fi
+
+# Prepare gdm for calamares
+if [[ -f "/usr/share/calamares/modules/services.conf" ]]; then
+    sed -i "s|%DM%|gdm|g" "/usr/share/calamares/modules/services.conf"
+fi
index 6b4c173..7092780 100644 (file)
@@ -77,7 +77,7 @@ services:
   - name: "org.cups.cupsd"
     mandatory: false
 
-  - name: "lightdm-plymouth"
+  - name: "%DM%-plymouth"
     mandatory: false
 
   - name: "pacman-init"
diff --git a/modules/calamares/airootfs.any/usr/share/calamares/modules/services.conf b/modules/calamares/airootfs.any/usr/share/calamares/modules/services.conf
new file mode 100644 (file)
index 0000000..7092780
--- /dev/null
@@ -0,0 +1,105 @@
+# Systemd services manipulation.
+#
+# This module can enable services and targets for systemd
+# (if packaging doesn't already do that). It can calso
+# disable services (but not targets).
+#
+# First, services are enabled; then targets; then services
+# are disabled -- this order of operations is fixed.
+---
+
+# There are three configuration keys for this module:
+# *services*, *targets* and *disable*. The value of each
+# key is a list of entries. Each entry has two keys:
+#   - *name* is the (string) name of the service or target that is being
+#     changed. Use quotes. Don't include ".target" or ".service"
+#     in the name.
+#   - *mandatory* is a boolean option, which states whether the change
+#     must be done successfully. If systemd reports an error while changing
+#     a mandatory entry, the installation will fail. When mandatory is false,
+#     errors for that entry (service or target) are ignored. If mandatory
+#     is not specified, the default is false.
+#
+# An entry may also be given as a single string, which is then
+# interpreted as the name of the service. In this case, mandatory
+# is also set to the default of false.
+#
+# Use [] to express an empty list.
+
+# # This example enables NetworkManager (and fails if it can't),
+# # disables cups (and ignores failure). Then it enables the
+# # graphical target (e.g. so that SDDM runs for login), and
+# # finally disables pacman-init (an ArchLinux-only service).
+# #
+# # Enables <name>.service
+# services:
+#   - name: "NetworkManager"
+#     mandatory: true
+#   - name: "cups"
+#     mandatory: false
+#
+# # Enables <name>.target
+# targets:
+#   - name: "graphical"
+#     mandatory: true
+#
+# # Disables <name>.service
+# disable:
+#   - name: "pacman-init"
+#     mandatory: false
+#
+# # Disables <name>.target
+# #     .. this shows how to use just the name
+# disable-targets:
+#   - graphical
+#
+# # Masks (stronger version of disable). This section
+# # is unusual because you **must** include the suffix
+# # (e.g. ".service") as part of the name, so, e.g. to mask
+# # NetworkManager (rather than just disable it) you must
+# # specify "NetworkManager.service" as name.
+# mask:
+#  - name: "NetworkManager.service"
+#  - mandatory: true
+
+# By default, no changes are made.
+#services: []
+#targets: []
+#disable: []
+disable-targets: []
+
+# Manjaro settings
+
+services:
+  - name: "NetworkManager"
+    mandatory: false
+
+  - name: "org.cups.cupsd"
+    mandatory: false
+
+  - name: "%DM%-plymouth"
+    mandatory: false
+
+  - name: "pacman-init"
+    mandatory: false
+
+  - name: "tlp"
+    mandatory: false
+
+  - name: "tlp-sleep"
+    mandatory: false
+
+targets:
+  - name: "graphical"
+    mandatory: true
+
+disable:
+  - name: "dhcpcd"
+    mandatory: false
+
+mask:
+  - name: "systemd-rfkill"
+    mandatory: false
+
+  - name: "systemd-rfkill.socket"
+    mandatory: false
index ee6e9c4..84dad00 100755 (executable)
@@ -39,3 +39,9 @@ if [[ -f "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" ]] && cat "/etc
         exit 1
     fi
 fi
+
+
+# For calamares
+if [[ -f "/usr/share/calamares/modules/services.conf" ]]; then
+    sed -i "s|%DM%|lightdm|g" "/usr/share/calamares/modules/services.conf"
+fi