From 2fa08cd3541578d4411c7cbb4d933b2312428dff Mon Sep 17 00:00:00 2001 From: Brian Read Date: Wed, 8 Oct 2025 18:49:27 +0100 Subject: [PATCH] * Wed Oct 08 2025 Brian Read 1.4-9.sme - Add in smeserver-updates-update event to creatlinks [SME: 12780 ] - Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12780] --- .gitignore | 2 +- createlinks | 17 ++++++++++++++++- root/etc/e-smith/web/functions/update-system | 2 +- smeserver-updates-1.4.tar.xz | Bin 10264 -> 0 bytes smeserver-updates.spec | 9 +++++---- 5 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 smeserver-updates-1.4.tar.xz diff --git a/.gitignore b/.gitignore index cbb3a13..e594810 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.rpm *.log *spec-20* -*.tar.gz +*.tar.xz diff --git a/createlinks b/createlinks index f5b1be1..608a4c1 100644 --- a/createlinks +++ b/createlinks @@ -6,5 +6,20 @@ use File::Path; panel_link("update-system", "manager"); -event_link("update-system", "update-system", "10"); +# our event specific for updating with yum without reboot +$event = "smeserver-updates-update"; +#add here the path to your templates needed to expand +#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event +foreach my $file (qw( + /etc/systemd/system-preset/49-koozali.preset + )) + { + templates2events( $file, $event ); + } + +#action needed in case we have a systemd unit +event_link("systemd-default", $event, "10"); +event_link("systemd-reload", $event, "50"); + +event_link("update-system", "update-system", "10"); \ No newline at end of file diff --git a/root/etc/e-smith/web/functions/update-system b/root/etc/e-smith/web/functions/update-system index 4dc04da..3335df2 100644 --- a/root/etc/e-smith/web/functions/update-system +++ b/root/etc/e-smith/web/functions/update-system @@ -133,7 +133,7 @@ sub showInitial ($$) print $q->hidden (-name => 'state', -override => 1, -default => 'perform'); - print $q->end_form; + print $q->end_form; #Updated here esmith::cgi::genFooter ($q); } diff --git a/smeserver-updates-1.4.tar.xz b/smeserver-updates-1.4.tar.xz deleted file mode 100644 index 17c74fff264497adc8c2270c113a0d4a7f11413d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10264 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 diff --git a/smeserver-updates.spec b/smeserver-updates.spec index cfbe364..b8c226b 100644 --- a/smeserver-updates.spec +++ b/smeserver-updates.spec @@ -6,7 +6,7 @@ Summary: Update system panel for SMEserver รง %define name smeserver-updates Name: %{name} %define version 1.4 -%define release 8 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -23,8 +23,9 @@ Update system panel for sme server 9 permitting the uploading and installing of .rpms %changelog -* Tue Oct 07 2025 Brian Read 1.4-8.sme -- Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12775-87] +* Wed Oct 08 2025 Brian Read 1.4-9.sme +- Add in smeserver-updates-update event to creatlinks [SME: 12780 ] +- Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12780] * Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley 1.4-5.sme - Fix e-smith references in smeserver-updates [SME: 12732] @@ -64,7 +65,7 @@ permitting the uploading and installing of .rpms * Tue Dec 13 2005 Stephen Noble - sme7 version - removed all functions except for uploading and installing a rpm -- yum is usually a better option +- yum is usually a better option - [1.2-1] * Tue Feb 19 2002 Darrell May