/[smecontribs]/rpms/smeserver-tftp-server/contribs10/smeserver-tftp-server-1.2-fix-missing-systemd-directories.patch
ViewVC logotype

Contents of /rpms/smeserver-tftp-server/contribs10/smeserver-tftp-server-1.2-fix-missing-systemd-directories.patch

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


Revision 1.1 - (show annotations) (download)
Thu Apr 14 12:17:11 2022 UTC (2 years, 7 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-tftp-server-1_2-11_el7_sme, smeserver-tftp-server-1_2-13_el7_sme, smeserver-tftp-server--, smeserver-tftp-server-1_2-12_el7_sme, HEAD
Error occurred while calculating annotation data.
* Thu Apr 14 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-11.sme
- Fix missing systemd directories [SME: 11927]
- Add default 50koozali.conf files

1 diff -ruN smeserver-tftp-server-1.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/tftp.service.d/50koozali.conf/20Service smeserver-tftp-server-1.2/root/etc/e-smith/templates/usr/lib/systemd/system/tftp.service.d/50koozali.conf/20Service
2 --- smeserver-tftp-server-1.2.old/root/etc/e-smith/templates/usr/lib/systemd/system/tftp.service.d/50koozali.conf/20Service 2022-04-14 11:50:27.192637238 +0100
3 +++ smeserver-tftp-server-1.2/root/etc/e-smith/templates/usr/lib/systemd/system/tftp.service.d/50koozali.conf/20Service 2022-04-14 13:13:29.421384794 +0100
4 @@ -3,7 +3,7 @@
5 my $verbosity = "-v";
6 my $log = $tftp{log};
7 my $refuse = $tftp{refuse};
8 - my $privilege = $tftp{privilege} | "";
9 + my $privilege = $tftp{privilege} || "";
10 my $user = $tftp{user} || "";
11
12 # Now only relevant if you run under xinetd
13 @@ -29,20 +29,22 @@
14
15 if ( $privilege eq "rw" ) {
16 $privilege = "-c";
17 + } elsif ($privilege = "ro" ) {
18 + $privilege = "";
19 }
20
21 if ( $user ne "" ) {
22 $user = "-u $user";
23 }
24
25 + $OUT .= "\n";
26 $OUT .= "[Service]\n";
27 - $OUT .= "Options: man in.tftpd\n";
28 - $OUT .= "ExecStartPre=/bin/sleep 10\n";
29 + $OUT .= "# Options: man in.tftpd\n";
30 + $OUT .= "# ExecStartPre=/bin/sleep 10\n";
31 $OUT .= " \n";
32 $OUT .= "ExecStart=\n";
33 $OUT .= "ExecStart=/usr/sbin/in.tftpd -s /tftpboot $verbosity -B $blocksize $user $refuse $privilege\n";
34 $OUT .= " \n";
35 $OUT .= "StandardInput=socket\n";
36 -
37 }
38
39 diff -ruN smeserver-tftp-server-1.2.old/root/usr/lib/systemd/system/tftp.service.d/50koozali.conf smeserver-tftp-server-1.2/root/usr/lib/systemd/system/tftp.service.d/50koozali.conf
40 --- smeserver-tftp-server-1.2.old/root/usr/lib/systemd/system/tftp.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100
41 +++ smeserver-tftp-server-1.2/root/usr/lib/systemd/system/tftp.service.d/50koozali.conf 2022-04-14 12:58:20.590468655 +0100
42 @@ -0,0 +1,21 @@
43 +
44 +[Unit]
45 +Description=Tftp Server
46 +Requires=tftp.socket
47 +Documentation=man:in.tftpd
48 +After=network-online.target
49 +Wants=network-online.target
50 +
51 +[Service]
52 +Options: man in.tftpd
53 +#ExecStartPre=/bin/sleep 10
54 +
55 +ExecStart=
56 +ExecStart=/usr/sbin/in.tftpd -s /tftpboot -v -B 1464 -u nobody
57 +
58 +StandardInput=socket
59 +
60 +
61 +[Install]
62 +WantedBy= sme-server.target
63 +Also=tftp.socket
64 \ No newline at end of file
65 diff -ruN smeserver-tftp-server-1.2.old/root/usr/lib/systemd/system/tftp.socket.d/50koozali.conf smeserver-tftp-server-1.2/root/usr/lib/systemd/system/tftp.socket.d/50koozali.conf
66 --- smeserver-tftp-server-1.2.old/root/usr/lib/systemd/system/tftp.socket.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100
67 +++ smeserver-tftp-server-1.2/root/usr/lib/systemd/system/tftp.socket.d/50koozali.conf 2022-04-14 12:24:26.489083094 +0100
68 @@ -0,0 +1,4 @@
69 +[Socket]
70 +ListenDatagram=
71 +ListenDatagram=127.0.0.1:69
72 +FreeBin=true
73 \ No newline at end of file

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