napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'calamares:calamares' into luksbootkeyfile

Browse Source
This commit is contained in:
ABalfoort 2023-06-13 08:49:54 +02:00 committed by GitHub
commit 20b4cefedb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/displaymanager/main.py
View File

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

1
src/modules/initcpiocfg/main.py
View File

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

6
src/modules/packages/main.py
View File

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

6
src/modules/services-systemd/services-systemd.conf
View File

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