From 00b0ae7ba439a5a420095175b3bedd52c569db51 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Wed, 19 Apr 2023 20:55:42 +1000 Subject: PyParted and a large rewrite of the underlying partitioning (#1604) * Invert mypy files * Add optional pre-commit hooks * New profile structure * Serialize profiles * Use profile instead of classmethod * Custom profile setup * Separator between back * Support profile import via url * Move profiles module * Refactor files * Remove symlink * Add user to docker group * Update schema description * Handle list services * mypy fixes * mypy fixes * Rename profilesv2 to profiles * flake8 * mypy again * Support selecting DM * Fix mypy * Cleanup * Update greeter setting * Update schema * Revert toml changes * Poc external dependencies * Dependency support * New encryption menu * flake8 * Mypy and flake8 * Unify lsblk command * Update bootloader configuration * Git hooks * Fix import * Pyparted * Remove custom font setting * flake8 * Remove default preview * Manual partitioning menu * Update structure * Disk configuration * Update filesystem * luks2 encryption * Everything works until installation * Btrfsutil * Btrfs handling * Update btrfs * Save encryption config * Fix pipewire issue * Update mypy version * Update all pre-commit * Update package versions * Revert audio/pipewire * Merge master PRs * Add master changes * Merge master changes * Small renaming * Pull master changes * Reset disk enc after disk config change * Generate locals * Update naming * Fix imports * Fix broken sync * Fix pre selection on table menu * Profile menu * Update profile * Fix post_install * Added python-pyparted to PKGBUILD, this requires [testing] to be enabled in order to run makepkg. Package still works via python -m build etc. * Swaped around some setuptools logic in pyproject Since we define `package-data` and `packages` there should be no need for: ``` [tool.setuptools.packages.find] where = ["archinstall", "archinstall.*"] ``` * Removed pyproject collisions. Duplicate definitions. * Made sure pyproject.toml includes languages * Add example and update README * Fix pyproject issues * Generate locale * Refactor imports * Simplify imports * Add profile description and package examples * Align code * Fix mypy * Simplify imports * Fix saving config * Fix wrong luks merge * Refactor installation * Fix cdrom device loading * Fix wrongly merged code * Fix imports and greeter * Don't terminate on partprobe error * Use specific path on partprobe from luks * Update archinstall/lib/disk/device_model.py Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> * Update archinstall/lib/disk/device_model.py Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> * Update github workflow to test archinstall installation * Update sway merge * Generate locales * Update workflow --------- Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum Co-authored-by: Anton Hvornum Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com> --- profiles/applications/__init__.py | 0 profiles/applications/awesome.py | 34 ---------------------------------- profiles/applications/cockpit.py | 13 ------------- profiles/applications/docker.py | 9 --------- profiles/applications/httpd.py | 9 --------- profiles/applications/lighttpd.py | 9 --------- profiles/applications/mariadb.py | 11 ----------- profiles/applications/nginx.py | 9 --------- profiles/applications/pipewire.py | 14 -------------- profiles/applications/postgresql.py | 11 ----------- profiles/applications/sshd.py | 9 --------- profiles/applications/tomcat.py | 12 ------------ 12 files changed, 140 deletions(-) delete mode 100644 profiles/applications/__init__.py delete mode 100644 profiles/applications/awesome.py delete mode 100644 profiles/applications/cockpit.py delete mode 100644 profiles/applications/docker.py delete mode 100644 profiles/applications/httpd.py delete mode 100644 profiles/applications/lighttpd.py delete mode 100644 profiles/applications/mariadb.py delete mode 100644 profiles/applications/nginx.py delete mode 100644 profiles/applications/pipewire.py delete mode 100644 profiles/applications/postgresql.py delete mode 100644 profiles/applications/sshd.py delete mode 100644 profiles/applications/tomcat.py (limited to 'profiles/applications') diff --git a/profiles/applications/__init__.py b/profiles/applications/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/profiles/applications/awesome.py b/profiles/applications/awesome.py deleted file mode 100644 index 33526fd7..00000000 --- a/profiles/applications/awesome.py +++ /dev/null @@ -1,34 +0,0 @@ -import archinstall - -__packages__ = [ - "awesome", - "xorg-xrandr", - "xterm", - "feh", - "slock", - "terminus-font", - "gnu-free-fonts", - "ttf-liberation", - "xsel", -] - -archinstall.storage['installation_session'].install_profile('xorg') - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -with open(f"{archinstall.storage['installation_session'].target}/etc/X11/xinit/xinitrc", 'r') as xinitrc: - xinitrc_data = xinitrc.read() - -for line in xinitrc_data.split('\n'): - if "twm &" in line: - xinitrc_data = xinitrc_data.replace(line, f"# {line}") - if "xclock" in line: - xinitrc_data = xinitrc_data.replace(line, f"# {line}") - if "xterm" in line: - xinitrc_data = xinitrc_data.replace(line, f"# {line}") - -xinitrc_data += '\n' -xinitrc_data += 'exec awesome\n' - -with open(f"{archinstall.storage['installation_session'].target}/etc/X11/xinit/xinitrc", 'w') as xinitrc: - xinitrc.write(xinitrc_data) diff --git a/profiles/applications/cockpit.py b/profiles/applications/cockpit.py deleted file mode 100644 index d8aa0fd1..00000000 --- a/profiles/applications/cockpit.py +++ /dev/null @@ -1,13 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = [ - "cockpit", - "udisks2", - "packagekit", -] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('cockpit.socket') diff --git a/profiles/applications/docker.py b/profiles/applications/docker.py deleted file mode 100644 index afbde1a5..00000000 --- a/profiles/applications/docker.py +++ /dev/null @@ -1,9 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["docker"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('docker') diff --git a/profiles/applications/httpd.py b/profiles/applications/httpd.py deleted file mode 100644 index 23b3fefa..00000000 --- a/profiles/applications/httpd.py +++ /dev/null @@ -1,9 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["apache"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('httpd') diff --git a/profiles/applications/lighttpd.py b/profiles/applications/lighttpd.py deleted file mode 100644 index 71158861..00000000 --- a/profiles/applications/lighttpd.py +++ /dev/null @@ -1,9 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["lighttpd"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('lighttpd') diff --git a/profiles/applications/mariadb.py b/profiles/applications/mariadb.py deleted file mode 100644 index bdde18b5..00000000 --- a/profiles/applications/mariadb.py +++ /dev/null @@ -1,11 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["mariadb"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].arch_chroot("mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql") - -archinstall.storage['installation_session'].enable_service('mariadb') diff --git a/profiles/applications/nginx.py b/profiles/applications/nginx.py deleted file mode 100644 index 6f63b15c..00000000 --- a/profiles/applications/nginx.py +++ /dev/null @@ -1,9 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["nginx"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('nginx') diff --git a/profiles/applications/pipewire.py b/profiles/applications/pipewire.py deleted file mode 100644 index b6e79347..00000000 --- a/profiles/applications/pipewire.py +++ /dev/null @@ -1,14 +0,0 @@ -import archinstall -import logging - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["pipewire", "pipewire-alsa", "pipewire-jack", "pipewire-pulse", "gst-plugin-pipewire", "libpulse", "wireplumber"] - -archinstall.log('Installing pipewire', level=logging.INFO) -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -@archinstall.plugin -def on_user_created(installation :archinstall.Installer, user :str): - archinstall.log(f"Enabling pipewire-pulse for {user}", level=logging.INFO) - installation.chroot('systemctl enable --user pipewire-pulse.service', run_as=user) diff --git a/profiles/applications/postgresql.py b/profiles/applications/postgresql.py deleted file mode 100644 index 80ad4b66..00000000 --- a/profiles/applications/postgresql.py +++ /dev/null @@ -1,11 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["postgresql"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].arch_chroot("initdb -D /var/lib/postgres/data", run_as='postgres') - -archinstall.storage['installation_session'].enable_service('postgresql') diff --git a/profiles/applications/sshd.py b/profiles/applications/sshd.py deleted file mode 100644 index 4199ecb0..00000000 --- a/profiles/applications/sshd.py +++ /dev/null @@ -1,9 +0,0 @@ -import archinstall - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["openssh"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('sshd') diff --git a/profiles/applications/tomcat.py b/profiles/applications/tomcat.py deleted file mode 100644 index ae6d1c2a..00000000 --- a/profiles/applications/tomcat.py +++ /dev/null @@ -1,12 +0,0 @@ -import archinstall - -# This is using Tomcat 10 as that is the latest release at the time of implementation. -# This should probably be updated to use newer releases as they come out. - -# Define the package list in order for lib to source -# which packages will be installed by this profile -__packages__ = ["tomcat10"] - -archinstall.storage['installation_session'].add_additional_packages(__packages__) - -archinstall.storage['installation_session'].enable_service('tomcat10') -- cgit v1.2.3-54-g00ecf