/[smecontribs]/rpms/smeserver-nfs/contribs10/smeserver-nfs-1.2.0-bz12230.patch
ViewVC logotype

Contents of /rpms/smeserver-nfs/contribs10/smeserver-nfs-1.2.0-bz12230.patch

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


Revision 1.1 - (show annotations) (download)
Sat Nov 19 04:17:55 2022 UTC (2 years ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nfs-1_2_0-22_el7_sme, smeserver-nfs-1_2_0-21_el7_sme, HEAD
Error occurred while calculating annotation data.
* Fri Nov 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> %{version}-21.sme
- fix service not starting and not accessible [SME: 12230]
- using systemd and removing sysvinit links

1 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/createlinks smeserver-nfs-1.2.0/createlinks
2 --- smeserver-nfs-1.2.0.old/createlinks 2022-11-18 22:26:17.931000000 -0500
3 +++ smeserver-nfs-1.2.0/createlinks 2022-11-18 23:10:55.383000000 -0500
4 @@ -10,14 +10,15 @@
5 foreach my $file (qw(
6 /etc/systemd/system-preset/49-koozali.preset
7 /etc/exports
8 + /etc/hosts.allow
9 ))
10 {
11 templates2events( $file, $event );
12 }
13
14 #action needed in case we have a systemd unit
15 -event_link("systemd-default", $event, "10");
16 -event_link("systemd-reload", $event, "50");
17 +event_link("systemd-default", $event, "88");
18 +event_link("systemd-reload", $event, "89");
19
20 #action specific to this package
21 #event_link("nfs-update", $event, "60");
22 @@ -61,13 +62,17 @@
23 event_link("smeserver-nfs-restart-rpcbind", $event, "05");
24 }
25
26 +$event="nfs-update";
27 +templates2events("/etc/hosts.allow", $event);
28 +
29 #here a specific event only for the server-manager, nfs-update is an event a bit long
30 foreach $event (qw(nfs-conf))
31 {
32 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/nfs");
33 templates2events("/etc/exports", $event);
34 + templates2events("/etc/hosts.allow", $event);
35 }
36
37 -service_link_enhanced("rpcbind", "S13", "7");
38 -service_link_enhanced("nfslock", "S59", "7");
39 -service_link_enhanced("nfs", "S60", "7");
40 +#service_link_enhanced("rpcbind", "S13", "7");
41 +#service_link_enhanced("nfslock", "S59", "7");
42 +#service_link_enhanced("nfs", "S60", "7");
43 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/root/etc/e-smith/events/actions/smeserver-nfs-restart-rpcbind smeserver-nfs-1.2.0/root/etc/e-smith/events/actions/smeserver-nfs-restart-rpcbind
44 --- smeserver-nfs-1.2.0.old/root/etc/e-smith/events/actions/smeserver-nfs-restart-rpcbind 2022-11-18 22:26:17.928000000 -0500
45 +++ smeserver-nfs-1.2.0/root/etc/e-smith/events/actions/smeserver-nfs-restart-rpcbind 2022-11-18 23:14:30.619000000 -0500
46 @@ -1,4 +1,4 @@
47 #!/usr/bin/perl
48 #The service rpcbind needs to be restarted before nfs service,
49 ##but sometime it start before so I had to do a specific action
50 -system ('systemctl restart rcpbind.service') ==0 or die "Error to restart the rpcbind service : $?";
51 +system ('/usr/bin/systemctl restart rpcbind.service') ==0 or die "Error to restart the rpcbind service : $?";
52 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-nfs.preset smeserver-nfs-1.2.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-nfs.preset
53 --- smeserver-nfs-1.2.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-nfs.preset 1969-12-31 19:00:00.000000000 -0500
54 +++ smeserver-nfs-1.2.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-nfs.preset 2022-11-18 23:13:21.006000000 -0500
55 @@ -0,0 +1,12 @@
56 +#nfs specific
57 +{
58 +$status = $nfslock{status} || 'disabled';
59 +$status = ($status eq "enabled") ? "enable" : "disable";
60 +$OUT .= "$status rpc-statd.service\n";
61 +
62 +$status = $nfs{status} || 'disabled';
63 +$status = ($status eq "enabled") ? "enable" : "disable";
64 +$OUT .= "$status nfs-server.service\n";
65 +
66 +}
67 +
68 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/nfs-server.service.d/50koozali.conf smeserver-nfs-1.2.0/root/usr/lib/systemd/system/nfs-server.service.d/50koozali.conf
69 --- smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/nfs-server.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500
70 +++ smeserver-nfs-1.2.0/root/usr/lib/systemd/system/nfs-server.service.d/50koozali.conf 2022-11-18 23:13:20.001000000 -0500
71 @@ -0,0 +1,3 @@
72 +[Install]
73 +WantedBy=sme-server.target
74 +
75 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/rpcbind.service.d/50koozali.conf smeserver-nfs-1.2.0/root/usr/lib/systemd/system/rpcbind.service.d/50koozali.conf
76 --- smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/rpcbind.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500
77 +++ smeserver-nfs-1.2.0/root/usr/lib/systemd/system/rpcbind.service.d/50koozali.conf 2022-11-18 23:13:19.640000000 -0500
78 @@ -0,0 +1,3 @@
79 +[Install]
80 +WantedBy=sme-server.target
81 +
82 diff -Nur --no-dereference smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/rpc-statd.service.d/50koozali.conf smeserver-nfs-1.2.0/root/usr/lib/systemd/system/rpc-statd.service.d/50koozali.conf
83 --- smeserver-nfs-1.2.0.old/root/usr/lib/systemd/system/rpc-statd.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500
84 +++ smeserver-nfs-1.2.0/root/usr/lib/systemd/system/rpc-statd.service.d/50koozali.conf 2022-11-18 23:13:20.403000000 -0500
85 @@ -0,0 +1,3 @@
86 +[Install]
87 +WantedBy=sme-server.target
88 +

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