From 4bf1b0fa7e73a038c3fa5948d5e67698630ca5ab Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Wed, 17 May 2023 16:25:57 +0400 Subject: [PATCH 1/4] Add River and Hyprland to desktop list --- src/modules/displaymanager/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index d7533e122..2a1448e51 100644 --- a/src/modules/displaymanager/main.py +++ b/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'), ] From b2c75a1af8fffd997f2548a0019a7c2dd5d31e70 Mon Sep 17 00:00:00 2001 From: Panda <59401553+Rippanda12@users.noreply.github.com> Date: Sat, 20 May 2023 09:11:47 +0300 Subject: [PATCH 2/4] Fix initcpio ARM cpus dont have vendor tag in /proc/cpuinfo --- src/modules/initcpiocfg/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 5fd9d93ae..57dc5e432 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -54,8 +54,9 @@ class cpuinfo(object): self.number_of_cores = 0 cpu = self._cpuinfo() - self.is_intel = cpu['proc0']['vendor_id'].lower() == "genuineintel" - self.is_amd = cpu['proc0']['vendor_id'].lower() == "authenticamd" + 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) @staticmethod From 7a67840c9bdd5d8c955aba436848a197859a9b25 Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Mon, 22 May 2023 12:03:22 -0400 Subject: [PATCH 3/4] [packages] Call dnf-3 binary, not dnf DNF is being replaced by a new package manager, DNF 5, in Fedora 39+. The `dnf` binary will soon symlink to DNF 5 instead of DNF 5. The old DNF 4 binary will still be (and always has been) available as /usr/bin/dnf-3. Until Calamares adds support for DNF 5, it should explicitly call the old dnf-3 binary. --- src/modules/packages/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index e373a3443..26ed30a19 100644 --- a/src/modules/packages/main.py +++ b/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): From ca2e36b3f3c3d366c84b089cff610a7d7d98d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 26 May 2023 13:15:19 +0200 Subject: [PATCH 4/4] Update services-systemd.conf - reflect that file endings are now needed in the example --- src/modules/services-systemd/services-systemd.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/services-systemd/services-systemd.conf b/src/modules/services-systemd/services-systemd.conf index 6e7f34451..330a94c65 100644 --- a/src/modules/services-systemd/services-systemd.conf +++ b/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