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 17c74ff..0000000 Binary files a/smeserver-updates-1.4.tar.xz and /dev/null differ 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