Hello community, here is the log from the commit of package tftp for openSUSE:Factory checked in at 2015-11-06 00:10:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tftp (Old) and /work/SRC/openSUSE:Factory/.tftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tftp" Changes: -------- --- /work/SRC/openSUSE:Factory/tftp/tftp.changes 2015-09-24 07:17:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tftp.new/tftp.changes 2015-11-06 00:10:18.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 2 12:36:26 UTC 2015 - [email protected] + +- add a sysconfig file to allow passing parameters to the service + (requested in bsc#951591) + * added tftp.sysconfig + +------------------------------------------------------------------- New: ---- tftp.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tftp.spec ++++++ --- /var/tmp/diff_new_pack.96azK9/_old 2015-11-06 00:10:19.000000000 +0100 +++ /var/tmp/diff_new_pack.96azK9/_new 2015-11-06 00:10:19.000000000 +0100 @@ -30,6 +30,7 @@ Source2: tftp.fw Source3: tftp.service Source4: tftp.socket +Source5: tftp.sysconfig Patch0: tftp-hpa-0.43_include_sys_params.patch Patch1: tftp-hpa-0.46_colon_check.patch Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch @@ -91,6 +92,7 @@ # Install systemd unit / socket (As an alternativ to xinetd activation) install -d %{buildroot}%{_unitdir} install -m 0644 %{S:3} %{S:4} %{buildroot}%{_unitdir} +install -D -m 0644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.tftp %pre # This group/user is shared with atftp, so please @@ -105,6 +107,7 @@ %post %service_add_post %{name}.service %{name}.socket +%{fillup_only -n tftp} %preun %service_del_preun %{name}.service %{name}.socket @@ -128,5 +131,6 @@ %config(noreplace) %{_sysconfdir}/xinetd.d/tftp %config %{_fwdefdir}/tftp %dir %attr(0750,tftp,tftp) /srv/tftpboot +%{_localstatedir}/adm/fillup-templates/sysconfig.tftp %changelog ++++++ tftp.service ++++++ --- /var/tmp/diff_new_pack.96azK9/_old 2015-11-06 00:10:19.000000000 +0100 +++ /var/tmp/diff_new_pack.96azK9/_new 2015-11-06 00:10:19.000000000 +0100 @@ -4,6 +4,7 @@ After=network.target [Service] -ExecStart=/usr/sbin/in.tftpd -u tftp -s /srv/tftpboot +EnvironmentFile=/etc/sysconfig/tftp +ExecStart=/usr/sbin/in.tftpd -u $TFTP_USER -s $TFTP_DIRECTORY $TFTP_OPTIONS StandardInput=socket PrivateDevices=yes ++++++ tftp.sysconfig ++++++ ## Description: TFTP Configuration ## Type: string ## Default: "tftp" # # daemon user (tftp) # TFTP_USER="tftp" ## Type: string ## Default: "" ## ## INFO: # # tftp options # TFTP_OPTIONS="" ## Type: string ## Default: "/srv/tftpboot" ## was "/tftpboot" but ## "/tftpboot" is not allowed anymore in FHS 2.2. # # TFTP directory must be a world readable/writable directory. # By default /srv/tftpboot is assumed. # TFTP_DIRECTORY="/srv/tftpboot"
