Skip to content

Commit

Permalink
Kernel switching module: complete refactoring and hardening (#308)
Browse files Browse the repository at this point in the history
* Kernel switching module: hardening
* Add support for headers manipulation and adjust ZFS
* Apply several fixes to ZFS
* Move kernel related features under "Manage kernel options"
Perhaps one day this subfolder is done better as managing is still slow, but at least no affect whole system folder as before.

* Fallback to branch in case this info is lost - perhaps move this to global function.
* Ajust System submenu into new categories
  • Loading branch information
igorpecovnik authored Dec 9, 2024
1 parent ae2789f commit b49c9fd
Show file tree
Hide file tree
Showing 13 changed files with 542 additions and 369 deletions.
1 change: 1 addition & 0 deletions tests/SY202.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENABLED=true
1 change: 1 addition & 0 deletions tests/SY203.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENABLED=true
1 change: 1 addition & 0 deletions tests/SY206.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENABLED=true
1 change: 1 addition & 0 deletions tests/SY207.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENABLED=true
396 changes: 207 additions & 189 deletions tools/json/config.system.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions tools/modules/functions/set_runtime_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ function set_runtime_variables() {
BACKTITLE="Contribute: https://github.com/armbian/configng"
TITLE="Armbian configuration utility"
[[ -z "${DEFAULT_ADAPTER// /}" ]] && DEFAULT_ADAPTER="lo"
# zfs subsystem - determine if our kernel is not too recent
ZFS_DKMS_VERSION=$(LC_ALL=C apt-cache policy zfs-dkms | grep Candidate | xargs | cut -d" " -f2 | cut -c-5)
ZFS_KERNEL_MAX=$(wget -qO- https://github.com/openzfs/zfs/raw/refs/tags/zfs-${ZFS_DKMS_VERSION}/META | grep Maximum | cut -d" " -f2)

# detect desktop
check_desktop
Expand Down
2 changes: 2 additions & 0 deletions tools/modules/runtime/config.runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ fi
#plex_media_port="$(lsof -i -P -n | grep TCP | grep LISTEN | grep 'plex' | awk -F: '{print $2}' | awk '{print $1}' | head -n 1)"
#update_sub_submenu_data "Software" "Media" "SW22" "https://localhost:$plex_media_port"

update_sub_submenu_data "System" "Storage" "SY220" "$(module_zfs zfs_version)"
update_sub_submenu_data "System" "Storage" "SY221" "$(module_zfs zfs_installed_version)"
update_sub_submenu_data "Software" "Database" "DAT002" "Server: $LOCALIPADD"
update_sub_submenu_data "Software" "Database" "DAT006" "http://$LOCALIPADD:${module_options["module_phpmyadmin,port"]}"
update_sub_submenu_data "Software" "Media" "MED006" "http://$LOCALIPADD:${module_options["module_stirling,port"]}"
Expand Down
84 changes: 0 additions & 84 deletions tools/modules/system/armbian_fw_manipulate.sh

This file was deleted.

Loading

0 comments on commit b49c9fd

Please sign in to comment.