From 6fb2e0c129544e34c1033c0c220246f8c68d402a Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 15:16:35 +0530 Subject: plasma-wayland installer --- profiles/applications/kde-wayland.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 profiles/applications/kde-wayland.py diff --git a/profiles/applications/kde-wayland.py b/profiles/applications/kde-wayland.py new file mode 100644 index 00000000..cebc4cd8 --- /dev/null +++ b/profiles/applications/kde-wayland.py @@ -0,0 +1,7 @@ +import archinstall +packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm" +# if the package selection can be reduced go for it +if "nvidia" in _gfx_driver_packages: + packages = packages + " egl-wayland" +installation.add_additional_packages(packages) +# We'll support plasma-desktop-wayland (minimal) later -- cgit v1.2.3-54-g00ecf From 40c6aad0ed68ba8c3a5e98084f923d7840f4ed4e Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 15:32:29 +0530 Subject: xfs as partition option --- archinstall/lib/disk.py | 4 ++++ archinstall/lib/installer.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 80dc4735..35ff5712 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -134,6 +134,10 @@ class Partition(): if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0: raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') self.filesystem = 'ext4' + elif filesystem == 'xfs': + if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: + raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') + self.filesystem = 'xfs' else: raise DiskError(f'Fileformat {filesystem} is not yet implemented.') return True diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index e4219323..a193a812 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,7 +190,8 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - + if self.part.filesystem == 'xfs': + self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() @@ -310,4 +311,4 @@ class Installer(): with open(f'{self.mountpoint}/etc/vconsole.conf', 'w') as vconsole: vconsole.write(f'KEYMAP={language}\n') vconsole.write(f'FONT=lat9w-16\n') - return True \ No newline at end of file + return True -- cgit v1.2.3-54-g00ecf From 905f10e9d24e5d07afbd4e5293ed1124cba2edef Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 16:18:12 +0530 Subject: fixed tabs and spaces problem --- archinstall/lib/disk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 35ff5712..e9fa12a0 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -134,10 +134,10 @@ class Partition(): if (handle := sys_command(f'/usr/bin/mkfs.ext4 -F {self.path}')).exit_code != 0: raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') self.filesystem = 'ext4' - elif filesystem == 'xfs': - if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: - raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') - self.filesystem = 'xfs' + elif filesystem == 'xfs': + if (handle:= sys_command(f'/usr/bin/mkfs.xfs -f {self.path}')).exit_code != 0: + raise DiskError(f'Could not format {self.path} with {filesystem} because: {b"".join(handle)}') + self.filesystem = 'xfs' else: raise DiskError(f'Fileformat {filesystem} is not yet implemented.') return True -- cgit v1.2.3-54-g00ecf From 43c92b0aad321ce35b67d9829d2d7040c78fa5a7 Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 16:22:30 +0530 Subject: fixed tabs and spaces problem --- profiles/kde-wayland.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 profiles/kde-wayland.py diff --git a/profiles/kde-wayland.py b/profiles/kde-wayland.py new file mode 100644 index 00000000..9b6be2a1 --- /dev/null +++ b/profiles/kde-wayland.py @@ -0,0 +1,34 @@ +# A desktop environement using "KDE". +import archinstall, os + +# TODO: Remove hard dependency of bash (due to .bash_profile) + +def _prep_function(*args, **kwargs): + """ + Magic function called by the importing installer + before continuing any further. It also avoids executing any + other code in this stage. So it's a safe way to ask the user + for more input before any other installer steps start. + """ + + # KDE requires a functioning Xorg installation. + profile = archinstall.Profile(None, 'xorg') + with profile.load_instructions(namespace='xorg.py') as imported: + if hasattr(imported, '_prep_function'): + return imported._prep_function() + else: + print('Deprecated (??): xorg profile has no _prep_function() anymore') + +# Ensures that this code only gets executed if executed +# through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py") +# or through conventional import kde +if __name__ == 'kde': + # Install dependency profiles + installation.install_profile('xorg') + + # Install the application kde from the template under /applications/ + kde = archinstall.Application(installation, 'kde-wayland') + kde.install() + print("when you login, select Plasma (Wayland) for the wayland session") + # Enable autostart of KDE for all users + installation.enable_service('sddm') -- cgit v1.2.3-54-g00ecf From eb3526523421d420fac8191cacb9f5eda1056e52 Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 16:57:33 +0530 Subject: fixex spaces in installer.py --- archinstall/lib/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index a193a812..fb4b0abf 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,8 +190,8 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - if self.part.filesystem == 'xfs': - self.base_packages.append('xfsprogs') + if self.part.filesystem == 'xfs': + self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() -- cgit v1.2.3-54-g00ecf From f83129728ae1ce07075f975a1c3b60233bfef5a6 Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 17:01:34 +0530 Subject: fixed spaces in kde-wayland.py --- profiles/kde-wayland.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/kde-wayland.py b/profiles/kde-wayland.py index 9b6be2a1..66d31504 100644 --- a/profiles/kde-wayland.py +++ b/profiles/kde-wayland.py @@ -29,6 +29,6 @@ if __name__ == 'kde': # Install the application kde from the template under /applications/ kde = archinstall.Application(installation, 'kde-wayland') kde.install() - print("when you login, select Plasma (Wayland) for the wayland session") + print("when you login, select Plasma (Wayland) for the wayland session") # Enable autostart of KDE for all users installation.enable_service('sddm') -- cgit v1.2.3-54-g00ecf From 7c4fc1432294fd5e329d8bfb898fbc2a70cbaaaf Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 17:03:35 +0530 Subject: fixed spaces in kde-wayland.py --- profiles/applications/kde-wayland.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/applications/kde-wayland.py b/profiles/applications/kde-wayland.py index cebc4cd8..6a9be294 100644 --- a/profiles/applications/kde-wayland.py +++ b/profiles/applications/kde-wayland.py @@ -2,6 +2,6 @@ import archinstall packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm" # if the package selection can be reduced go for it if "nvidia" in _gfx_driver_packages: - packages = packages + " egl-wayland" + packages = packages + " egl-wayland" installation.add_additional_packages(packages) # We'll support plasma-desktop-wayland (minimal) later -- cgit v1.2.3-54-g00ecf From a54c6e3c2f702d5a5364903bc5a5d20bc6e097ec Mon Sep 17 00:00:00 2001 From: advaithm Date: Fri, 22 Jan 2021 17:08:35 +0530 Subject: replced slef.part with self.partition --- archinstall/lib/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index fb4b0abf..8c22b51f 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -190,7 +190,7 @@ class Installer(): if self.partition.filesystem == 'btrfs': #if self.partition.encrypted: self.base_packages.append('btrfs-progs') - if self.part.filesystem == 'xfs': + if self.partition.filesystem == 'xfs': self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) #self.genfstab() -- cgit v1.2.3-54-g00ecf From 5b7af12a9190bb06a4f12308f7ba1cc4c1101b6b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 22 Jan 2021 13:53:04 +0100 Subject: Safety checks prohibited this from running The safety mechanism prevents the installation-code under `if __name__` to run when importing to check for the `_prep_function`. when the import for `_prep_function` check is executed it imports with a bogus `__name__` override. This is to protect anything under if `__name__` from running just to be able to import and run `_prep_function()`. After that is done and the actual installation begins, it imports with a proper `__name__`, The namespace is `filename` minus the `.extension` *(.py)*, normally imports of modules with dashes (`-`) in the name is prohibited, but archintall's import mechanism supports this as it's a string-import via `importlib`. So modified to `if __name__ == 'kde-wayland'` and that worked great : ) --- profiles/kde-wayland.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/kde-wayland.py b/profiles/kde-wayland.py index 66d31504..31226952 100644 --- a/profiles/kde-wayland.py +++ b/profiles/kde-wayland.py @@ -22,7 +22,7 @@ def _prep_function(*args, **kwargs): # Ensures that this code only gets executed if executed # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py") # or through conventional import kde -if __name__ == 'kde': +if __name__ == 'kde-wayland': # Install dependency profiles installation.install_profile('xorg') -- cgit v1.2.3-54-g00ecf