Use vesamenu.c32 in tftpd.

diff --git a/config/rootfiles/packages/tftp-hpa b/config/rootfiles/packages/tftp-hpa
index 5bbbd7393ebfd47156ae53e13c116c7f97492f66..79868267b6cb1f0771cd7b631f0299e2e86bfcb6 100644 (file)
--- a/config/rootfiles/packages/tftp-hpa
+++ b/config/rootfiles/packages/tftp-hpa
@@ -6,3 +6,4 @@ usr/sbin/tftpd
 var/tftpboot
 var/tftpboot/pxelinux.0
 var/tftpboot/pxelinux.cfg
 var/tftpboot
 var/tftpboot/pxelinux.0
 var/tftpboot/pxelinux.cfg

+var/tftpboot/vesamenu.c32

diff --git a/lfs/tftp-hpa b/lfs/tftp-hpa
index 33fdb9387ac7b01214d6324e677b97b4239a1a15..82fbdff09818a3a7b1f70a019e9d695f29fb1e6b 100644 (file)
--- a/lfs/tftp-hpa
+++ b/lfs/tftp-hpa
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tftp-hpa
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tftp-hpa

-PAK_VER    = 1
+PAK_VER    = 2

 
 DEPS       = ""
 
 
 DEPS       = ""
 


@@ -82,6 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
        -mkdir -pv /var/tftpboot/pxelinux.cfg
        cd $(DIR_APP) && make install
        mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
        -mkdir -pv /var/tftpboot/pxelinux.cfg

-       cp -vf /usr/lib/syslinux/pxelinux.0 /var/tftpboot
+       cp -vf /usr/lib/syslinux/{pxelinux.0,vesamenu.c32} /var/tftpboot

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/tftp-hpa/install.sh b/src/paks/tftp-hpa/install.sh
index 6930b9062f45b7c447d9ba1136d4152be3b29dc8..f498bac2b004273f57ae19787fdc09df3dd28fc8 100644 (file)
--- a/src/paks/tftp-hpa/install.sh
+++ b/src/paks/tftp-hpa/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}

-start_service --background ${NAME}
+start_service --background tftpd

 ln -svf  ../init.d/tftpd /etc/rc.d/rc0.d/K00tftpd
 ln -svf  ../init.d/tftpd /etc/rc.d/rc3.d/S99tftpd
 ln -svf  ../init.d/tftpd /etc/rc.d/rc6.d/K00tftpd
 ln -svf  ../init.d/tftpd /etc/rc.d/rc0.d/K00tftpd
 ln -svf  ../init.d/tftpd /etc/rc.d/rc3.d/S99tftpd
 ln -svf  ../init.d/tftpd /etc/rc.d/rc6.d/K00tftpd

diff --git a/src/paks/tftp-hpa/uninstall.sh b/src/paks/tftp-hpa/uninstall.sh
index 95e70be329fd0ec5aa3f87d810f495bad125587f..20599489f7cfcc39b46f4e6b63e0b6c4765486d9 100644 (file)
--- a/src/paks/tftp-hpa/uninstall.sh
+++ b/src/paks/tftp-hpa/uninstall.sh
@@ -22,7 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh

-stop_service ${NAME}
+stop_service tftpd

 make_backup ${NAME}
 remove_files
 rm -rf /etc/rc.d/rc*.d/*tftpd
 make_backup ${NAME}
 remove_files
 rm -rf /etc/rc.d/rc*.d/*tftpd