From 7c3f5eacdf82a7b0bab88d7eb1f77413e39d4175 Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Wed, 30 Oct 2024 10:52:38 +0200 Subject: [PATCH 1/4] Update dist-upgrade submodule to make it possible to retrive kernel modules --- dist-upgrader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist-upgrader b/dist-upgrader index db08062..2391b2f 160000 --- a/dist-upgrader +++ b/dist-upgrader @@ -1 +1 @@ -Subproject commit db0806293a10d4867ccf4669dc11e9b0e3b4bcbe +Subproject commit 2391b2f1430f8fa1011dd5c9f0bb09c834760058 From 71f29de3edfdc2d6aef458085f09a06910e8744c Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Wed, 30 Oct 2024 10:54:09 +0200 Subject: [PATCH 2/4] Small improvements to make src of utility close to ubuntu18to20 --- debian11to12/upgrader.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian11to12/upgrader.py b/debian11to12/upgrader.py index 5b28693..bc65f68 100644 --- a/debian11to12/upgrader.py +++ b/debian11to12/upgrader.py @@ -16,7 +16,6 @@ class Debian11to12Upgrader(DistUpgrader): _distro_from = dist.Debian("11") _distro_to = dist.Debian("12") - def __init__(self): super().__init__() @@ -37,7 +36,6 @@ def supports( and (to_system is None or cls._distro_to == to_system) ) - @property def upgrader_name(self) -> str: return "Plesk::Debian11to12Upgrader" @@ -68,7 +66,7 @@ def construct_actions( options: typing.Any, phase: Phase ) -> typing.Dict[str, typing.List[action.ActiveAction]]: - new_os = f"{self._distro_to}" + new_os = str(self._distro_to) return { "Prepare": [ actions.HandleConversionStatus(options.status_flag_path, options.completion_flag_path), @@ -139,7 +137,7 @@ def get_check_actions(self, options: typing.Any, phase: Phase) -> typing.List[ac ] def parse_args(self, args: typing.Sequence[str]) -> None: - DESC_MESSAGE = f"""Use this upgrader to dist-upgrade an {self._distro_from} server with Plesk to {self._distro_to} The process consists of the following general stages: + DESC_MESSAGE = f"""Use this upgrader to dist-upgrade an {self._distro_from} server with Plesk to {self._distro_to}. The process consists of the following general stages: -- Preparation (about 5 minutes) - The OS is prepared for the conversion. -- Conversion (about 15 minutes) - Plesk and system dist-upgrade is performed. From 09b0defd1af0f8a1acb0fab1fb819833ffd71832 Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Wed, 30 Oct 2024 10:54:57 +0200 Subject: [PATCH 3/4] Remove excessive '\' in apt adoption regular expression --- debian11to12/upgrader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian11to12/upgrader.py b/debian11to12/upgrader.py index bc65f68..216df95 100644 --- a/debian11to12/upgrader.py +++ b/debian11to12/upgrader.py @@ -95,7 +95,7 @@ def construct_actions( '\g<1>://\g<2>/\g<3>12.7\g<4>', ), actions.ReplaceAptReposRegexp( - r'(http|https)://([^/]+)/(.*\b)11\(\b.*)', + r'(http|https)://([^/]+)/(.*\b)11(\b.*)', '\g<1>://\g<2>/\g<3>12\g<4>', ), actions.SwitchPleskRepositories(to_os_version="12"), From 4b11453e0babe2886023393811e1a05ceb84a846 Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Wed, 30 Oct 2024 10:55:19 +0200 Subject: [PATCH 4/4] Add list of kernel modules into the feedback archive --- debian11to12/upgrader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/debian11to12/upgrader.py b/debian11to12/upgrader.py index 216df95..e4182a4 100644 --- a/debian11to12/upgrader.py +++ b/debian11to12/upgrader.py @@ -57,6 +57,7 @@ def prepare_feedback( feedback.collect_installed_packages_dpkg, feedback.collect_apt_policy, feedback.collect_plesk_version, + feedback.collect_kernel_modules, ] return feed