tftpd: add missing directory

Message ID 20220723161408.3370724-1-jon.murphy@ipfire.org
State Superseded
Headers
Series tftpd: add missing directory |

Commit Message

jon July 23, 2022, 4:14 p.m. UTC
  - starting tftpd currently throws "missing directory" error
 - this change corrects the issue

Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
---
 lfs/tftpd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
  

Comments

Peter Müller July 24, 2022, 12:52 p.m. UTC | #1
Hello Jon,

thank you for submitting this.

Just a quick question: With regards to the tftpd rootfile (which currently does not
include /var/tftpboot), isn't this change necessary during installation of the add-on
(as well)? I. e., shouldn't this go into the installation script of the add-on?

Or did I got this wrong?

Thanks, and best regards,
Peter Müller


>   - starting tftpd currently throws "missing directory" error
>   - this change corrects the issue
> 
> Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
> ---
>   lfs/tftpd | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lfs/tftpd b/lfs/tftpd
> index cb3d03415..f441c499c 100644
> --- a/lfs/tftpd
> +++ b/lfs/tftpd
> @@ -1,7 +1,7 @@
>   ###############################################################################
>   #                                                                             #
>   # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
>   #                                                                             #
>   # This program is free software: you can redistribute it and/or modify        #
>   # it under the terms of the GNU General Public License as published by        #
> @@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
>   DIR_APP    = $(DIR_SRC)/$(THISAPP)
>   TARGET     = $(DIR_INFO)/$(THISAPP)
>   PROG       = tftpd
> -PAK_VER    = 2
> +PAK_VER    = 3
>   
>   DEPS       =
>   
> @@ -87,6 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>   	cd $(DIR_APP) && make $(MAKETUNING)
>   	cd $(DIR_APP) && make install
>   	mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
> +	mkdir -pv /var/tftpboot
>   	#install initscripts
>   	$(call INSTALL_INITSCRIPTS,$(SERVICES))
>   	@rm -rf $(DIR_APP)
  
Jon Murphy July 24, 2022, 5:13 p.m. UTC | #2
Peter,

Since I am still learning I must defer to you.  I had assumed (bad word!) the 
`mkdir -pv /var/tftpboot` below would have done both.

> shouldn't this go into the installation script of the add-on?

I think the answer is "yes".

Is the `mkdir -pv /var/tftpboot` below for the make build phase only?

If `mkdir -pv /var/tftpboot` belongs in the `install.sh` script then I can add it.  
And I can remove the `mkdir -pv /var/tftpboot` from the LFS file.

Your guidance is needed!

Jon


> On Jul 24, 2022, at 7:52 AM, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Jon,
> 
> thank you for submitting this.
> 
> Just a quick question: With regards to the tftpd rootfile (which currently does not
> include /var/tftpboot), isn't this change necessary during installation of the add-on
> (as well)? I. e., shouldn't this go into the installation script of the add-on?
> 
> Or did I got this wrong?
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>> - starting tftpd currently throws "missing directory" error
>> - this change corrects the issue
>> Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
>> ---
>> lfs/tftpd | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>> diff --git a/lfs/tftpd b/lfs/tftpd
>> index cb3d03415..f441c499c 100644
>> --- a/lfs/tftpd
>> +++ b/lfs/tftpd
>> @@ -1,7 +1,7 @@
>> ###############################################################################
>> #                                                                             #
>> # IPFire.org - A linux based firewall                                         #
>> -# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
>> +# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
>> #                                                                             #
>> # This program is free software: you can redistribute it and/or modify        #
>> # it under the terms of the GNU General Public License as published by        #
>> @@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
>> DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> TARGET     = $(DIR_INFO)/$(THISAPP)
>> PROG       = tftpd
>> -PAK_VER    = 2
>> +PAK_VER    = 3
>>   DEPS       =
>> @@ -87,6 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> 	cd $(DIR_APP) && make $(MAKETUNING)
>> 	cd $(DIR_APP) && make install
>> 	mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
>> +	mkdir -pv /var/tftpboot
>> 	#install initscripts
>> 	$(call INSTALL_INITSCRIPTS,$(SERVICES))
>> 	@rm -rf $(DIR_APP)
  

Patch

diff --git a/lfs/tftpd b/lfs/tftpd
index cb3d03415..f441c499c 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,7 +34,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tftpd
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -87,6 +87,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
+	mkdir -pv /var/tftpboot
 	#install initscripts
 	$(call INSTALL_INITSCRIPTS,$(SERVICES))
 	@rm -rf $(DIR_APP)