/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12421-systemd.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz12421-systemd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Fri Nov 24 03:41:45 2023 UTC (12 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_1-31_el7_sme, e-smith-base-5_8_1-30_el7_sme, HEAD
* Thu Nov 23 2023 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.1-30.sme
- fix group deletion leaves mail spool file [SME: 12431]
- fix path to /etc/systemd for seeking service files [SME: 12421]

1 jpp 1.1 diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/systemd-default e-smith-base-5.8.1/root/etc/e-smith/events/actions/systemd-default
2     --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/systemd-default 2023-11-23 22:32:14.082000000 -0500
3     +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/systemd-default 2023-11-23 22:32:57.090000000 -0500
4     @@ -105,7 +105,7 @@
5     my $multiple = $service;
6     ($multiple = $service ) =~ s/([a-zA-Z0-9\-_.]+@)(.*)/$1.service/ if ( $service =~ /@/ );
7     #print "$stats $service $multiple\n";
8     - next unless ( -e "/usr/lib/systemd/system/$service" or -e "/etc/lib/systemd/system/$service" or -e "/usr/lib/systemd/system/$multiple");
9     + next unless ( -e "/usr/lib/systemd/system/$service" or -e "/etc/systemd/system/$service" or -e "/usr/lib/systemd/system/$multiple");
10     # eliminate duplicates, this way we keep only the last entry of the lowest file as we do it in reverse order of file,
11     # but from top to bottom of file.
12     $services{$service}=$stats;
13     diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/20services e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/20services
14     --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/20services 2023-11-23 22:32:14.083000000 -0500
15     +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/20services 2023-11-23 22:33:26.231000000 -0500
16     @@ -11,7 +11,7 @@
17     my $multiple = $servicename;
18     ($multiple = $servicename ) =~ s/([a-zA-Z0-9\-_.]+@)(.*)/$1.service/ if ( $servicename =~ /@/ );
19    
20     - $OUT .= "# Systemd service file does not exist : " unless -e "/usr/lib/systemd/system/$servicename" || -e "/etc/lib/systemd/system/$servicename" || -e "/usr/lib/systemd/system/$multiple";
21     + $OUT .= "# Systemd service file does not exist : " unless -e "/usr/lib/systemd/system/$servicename" || -e "/etc/systemd/system/$servicename" || -e "/usr/lib/systemd/system/$multiple";
22     $OUT .= "$status $servicename\n";
23     $OUT .= "$status $multiple\n" unless $multiple eq $servicename ;
24    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed