smeserver/smeserver-base
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fri Jan 03 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-21.sme

Browse Source 
- improve support of  systemd service with instance service@instance.service [SME: 12859]
This commit is contained in:
Jean-Philippe Pialasse 2025-01-03 01:54:02 -05:00
parent 5c4bf19137
commit e4b308e422
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
root/etc/e-smith/events/actions/systemd-default
View File

@ -54,7 +54,9 @@ if (!symlink($old_qfn, $new_qfn)) {
# we let the dedicated systemd command tryin to do what we will do later in this script # we let the dedicated systemd command tryin to do what we will do later in this script
# as up to systemd 236 it is bugged see: # as up to systemd 236 it is bugged see:
# https://github.com/systemd/systemd/pull/7158 and https://github.com/systemd/systemd/pull/7289 # https://github.com/systemd/systemd/pull/7158 : systemctl: respect [Install] section in drop-ins: should be fixed in SME 12 (239)
# https://github.com/systemd/systemd/issues/9477 : aliases; open
# https://github.com/systemd/systemd/pull/9901 allow instantiated units to be enabled via presets v240
system("/usr/bin/systemctl preset-all"); system("/usr/bin/systemctl preset-all");
# in case preset-all messed up with our default target # in case preset-all messed up with our default target
system("/usr/bin/systemctl set-default sme-server.target"); system("/usr/bin/systemctl set-default sme-server.target");
@ -101,10 +103,11 @@ foreach my $filen (reverse sort keys %files) {
my $service=$2; my $service=$2;
my $stats=$1; my $stats=$1;
# print $_ ."\n"; # print $_ ."\n";
#ignore service that does not exists ! # ignore service that does not exists !
# here we are searching for service@instance.service type
my $multiple = $service; my $multiple = $service;
($multiple = $service ) =~ s/([a-zA-Z0-9\-_.]+@)(.*)/$1.service/ if ( $service =~ /@/ ); ($multiple = $service ) =~ s/([a-zA-Z0-9\-_.]+@)(.*)/$1.service/ if ( $service =~ /@/ );
#print "$stats $service $multiple\n"; #print "$stats $service $multiple\n" if $service ne $multiple;
next unless ( -e "/usr/lib/systemd/system/$service" or -e "/etc/systemd/system/$service" or -e "/usr/lib/systemd/system/$multiple"); next unless ( -e "/usr/lib/systemd/system/$service" or -e "/etc/systemd/system/$service" or -e "/usr/lib/systemd/system/$multiple");
# eliminate duplicates, this way we keep only the last entry of the lowest file as we do it in reverse order of file, # eliminate duplicates, this way we keep only the last entry of the lowest file as we do it in reverse order of file,
# but from top to bottom of file. # but from top to bottom of file.
@ -117,7 +120,7 @@ foreach my $filen (reverse sort keys %files) {
#print "want $service \n"; #print "want $service \n";
} }
else { else {
my $wanted = `grep -P '^WantedBy=.*sme-server.target' /usr/lib/systemd/system/$service* /etc/systemd/system/$service* -rsh` ; my $wanted = `grep -P '^WantedBy=.*sme-server.target' /usr/lib/systemd/system/$service* /etc/systemd/system/$service* /usr/lib/systemd/system/$multiple* /etc/systemd/system/$multiple* -rsh` ;
chomp $wanted; chomp $wanted;
$wantedBy{$service}=1 unless ( $wanted eq ""); $wantedBy{$service}=1 unless ( $wanted eq "");
#print "want $service \n" unless ( $wanted eq "") ; #print "want $service \n" unless ( $wanted eq "") ;

5
smeserver-base.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
%define name smeserver-base %define name smeserver-base
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 20 %define release 21
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -184,6 +184,9 @@ fi
%changelog %changelog
* Fri Jan 03 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-21.sme
- improve support of systemd service with instance service@instance.service [SME: 12859]
* Thu Jan 02 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme * Thu Jan 02 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme
- Primary default to SSL required and redirect [SME: 12858] - Primary default to SSL required and redirect [SME: 12858]
- cleanup remove primary=system [SME: 8268] - cleanup remove primary=system [SME: 8268]