Merge branch 'calamares:calamares' into luksbootkeyfile

src/modules/displaymanager/main.py

@@ -197,6 +197,8 @@ desktop_environments = [
     DesktopEnvironment('/usr/bin/sway', 'sway'),
     DesktopEnvironment('/usr/bin/ukui-session', 'ukui'),
     DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'),
+    DesktopEnvironment('/usr/bin/river', 'river'),
+    DesktopEnvironment('/usr/bin/Hyprland', 'hyprland'),
 ]
 
 

src/modules/initcpiocfg/main.py

@@ -54,6 +54,7 @@ class cpuinfo(object):
         self.number_of_cores = 0
 
         cpu = self._cpuinfo()
+        if 'vendor_id' in cpu['proc0']:
             self.is_intel = cpu['proc0']['vendor_id'].lower() == "genuineintel"
             self.is_amd = cpu['proc0']['vendor_id'].lower() == "authenticamd"
         self.number_of_cores = len(cpu)

src/modules/packages/main.py

@@ -282,12 +282,12 @@ class PMDnf(PackageManager):
     backend = "dnf"
 
     def install(self, pkgs, from_local=False):
-        check_target_env_call(["dnf", "-y", "install"] + pkgs)
+        check_target_env_call(["dnf-3", "-y", "install"] + pkgs)
 
     def remove(self, pkgs):
         # ignore the error code for now because dnf thinks removing a
         # nonexistent package is an error
-        target_env_call(["dnf", "--disablerepo=*", "-C", "-y",
+        target_env_call(["dnf-3", "--disablerepo=*", "-C", "-y",
                          "remove"] + pkgs)
 
     def update_db(self):
@@ -295,7 +295,7 @@ class PMDnf(PackageManager):
         pass
 
     def update_system(self):
-        check_target_env_call(["dnf", "-y", "upgrade"])
+        check_target_env_call(["dnf-3", "-y", "upgrade"])
 
 
 class PMDummy(PackageManager):

src/modules/services-systemd/services-systemd.conf

@@ -31,7 +31,7 @@
 # # finally masks pacman-init (an ArchLinux-only service).
 # #
 # units:
-#   - name: "NetworkManager"
+#   - name: "NetworkManager.service"
 #     action: "enable" 
 #     mandatory: true
 #
@@ -40,12 +40,12 @@
 #     # The property "mandatory" is taken to be false by default here
 #     # because it is not specified
 #
-#   - name: "graphical"
+#   - name: "graphical.target"
 #     action: "enable" 
 #     # The property "mandatory" is taken to be false by default here
 #     # because it is not specified
 #
-#   - name: "pacman-init"
+#   - name: "pacman-init.service"
 #     action: "mask"
 #     # The property "mandatory" is taken to be false by default here
 #     # because it is not specified