diff mbox series

[v2] tftpd: add missing directory

Message ID 20220801151122.854266-1-jon.murphy@ipfire.org
State Accepted
Commit 645c2eb8dce4a6a193f672aa47a696b2c7dc16de
Headers
Series [v2] tftpd: add missing directory |

Commit Message

jon Aug. 1, 2022, 3:11 p.m. UTC 
  - starting tftpd currently throws "missing directory" error
- this change corrects the issue

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

Comments

Jon Murphy Aug. 1, 2022, 3:26 p.m. UTC | #1 
Peter and *,

I am not sure if I did this correctly or not.  

As best as I can tell I can add the `mkdir -pv /var/tftpboot` to:
- The tftpd LFS file
- The tftpd ROOTFILES file (as just `/var/tftpboot`)
- And/or the tftpd `install.sh` file

But I am not sure why I should pick one over the others…


Jon

> On Aug 1, 2022, at 10:11 AM, Jon Murphy <jon.murphy@ipfire.org> wrote:
> 
> - starting tftpd currently throws "missing directory" error
> - this change corrects the issue
> 
> Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
> ---
> config/rootfiles/packages/tftpd | 1 +
> lfs/tftpd                       | 5 +++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd
> index 377f8a21e..da19f46a0 100644
> --- a/config/rootfiles/packages/tftpd
> +++ b/config/rootfiles/packages/tftpd
> @@ -4,3 +4,4 @@ usr/sbin/tftpd
> #usr/share/man/man1/tftp.1
> #usr/share/man/man8/in.tftpd.8
> #usr/share/man/man8/tftpd.8
> +var/tftpboot
> 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)
> -- 
> 2.30.2
>
Stefan Schantl Aug. 1, 2022, 4:50 p.m. UTC | #2 
Creating the missing directory in the LFS file and an entry in the rootfile 
tracks best where this directory belongs to and should be the prefered way.

Acked-by: Stefan Schantl <stefan.schantl@ipfire.org>

Am 1. August 2022 17:12:03 schrieb Jon Murphy <jon.murphy@ipfire.org>:

> - starting tftpd currently throws "missing directory" error
> - this change corrects the issue
>
> Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
> ---
> config/rootfiles/packages/tftpd | 1 +
> lfs/tftpd                       | 5 +++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd
> index 377f8a21e..da19f46a0 100644
> --- a/config/rootfiles/packages/tftpd
> +++ b/config/rootfiles/packages/tftpd
> @@ -4,3 +4,4 @@ usr/sbin/tftpd
> #usr/share/man/man1/tftp.1
> #usr/share/man/man8/in.tftpd.8
> #usr/share/man/man8/tftpd.8
> +var/tftpboot
> 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)
> --
> 2.30.2
Jon Murphy Aug. 16, 2022, 7:49 p.m. UTC | #3 
Testing on APU4d4 with IPFire 2.27 (x86_64) - Core-Update 170 Development Build: master/ef7d41ef

tftpd server mode with no missing directory error.  A-OK!

Tested-by: Jon Murphy <jon.murphy@ipfire.org <mailto:jon.murphy@ipfire.org>>

> On Aug 1, 2022, at 11:50 AM, Stefan Schantl <stefan.schantl@ipfire.org <mailto:stefan.schantl@ipfire.org>> wrote:
> 
> Creating the missing directory in the LFS file and an entry in the rootfile tracks best where this directory belongs to and should be the prefered way.
> 
> Acked-by: Stefan Schantl <stefan.schantl@ipfire.org <mailto:stefan.schantl@ipfire.org>>
> 
> Am 1. August 2022 17:12:03 schrieb Jon Murphy <jon.murphy@ipfire.org <mailto:jon.murphy@ipfire.org>>:
> 
>> - starting tftpd currently throws "missing directory" error
>> - this change corrects the issue
>> 
>> Signed-off-by: Jon Murphy <jon.murphy@ipfire.org <mailto:jon.murphy@ipfire.org>>
>> ---
>>  config/rootfiles/packages/tftpd | 1 +
>>  lfs/tftpd                       | 5 +++--
>>  2 files changed, 4 insertions(+), 2 deletions(-)
>> 
>> diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd
>> index 377f8a21e..da19f46a0 100644
>> --- a/config/rootfiles/packages/tftpd
>> +++ b/config/rootfiles/packages/tftpd
>> @@ -4,3 +4,4 @@ usr/sbin/tftpd
>>  #usr/share/man/man1/tftp.1
>>  #usr/share/man/man8/in.tftpd.8
>>  #usr/share/man/man8/tftpd.8
>> +var/tftpboot
>> diff --git a/lfs/tftpd b/lfs/tftpd
>> index cb3d03415..f441c499c 100644
>> --- a/lfs/tftpd
>> +++ b/lfs/tftpd
>> @@ -1,7 +1,7 @@
>>  ###############################################################################
>>  #                                                                             #
>>  # IPFire.org <http://ipfire.org/> - A linux based firewall                                         #
>> -# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org <mailto:info@ipfire.org>>                     #
>> +# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org <mailto: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)
>> -- 
>> 2.30.2
> 
>
diff mbox series

Patch

diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd
index 377f8a21e..da19f46a0 100644
--- a/config/rootfiles/packages/tftpd
+++ b/config/rootfiles/packages/tftpd
@@ -4,3 +4,4 @@  usr/sbin/tftpd
 #usr/share/man/man1/tftp.1
 #usr/share/man/man8/in.tftpd.8
 #usr/share/man/man8/tftpd.8
+var/tftpboot
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)