From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Jul 2008 09:29:27 +0000 (+0000)
Subject: Use vesamenu.c32 in tftpd.
X-Git-Tag: v2.3-beta2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94ca4c287549f5ad1fe0213a77d9f89ffa4086f5;p=ipfire-2.x.git

Use vesamenu.c32 in tftpd.
---

diff --git a/config/rootfiles/packages/tftp-hpa b/config/rootfiles/packages/tftp-hpa
index 5bbbd7393e..79868267b6 100644
--- 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/vesamenu.c32
diff --git a/lfs/tftp-hpa b/lfs/tftp-hpa
index 33fdb9387a..82fbdff098 100644
--- 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
-PAK_VER    = 1
+PAK_VER    = 2
 
 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
-	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)
diff --git a/src/paks/tftp-hpa/install.sh b/src/paks/tftp-hpa/install.sh
index 6930b9062f..f498bac2b0 100644
--- 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}
-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
diff --git a/src/paks/tftp-hpa/uninstall.sh b/src/paks/tftp-hpa/uninstall.sh
index 95e70be329..20599489f7 100644
--- a/src/paks/tftp-hpa/uninstall.sh
+++ b/src/paks/tftp-hpa/uninstall.sh
@@ -22,7 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
+stop_service tftpd
 make_backup ${NAME}
 remove_files
 rm -rf /etc/rc.d/rc*.d/*tftpd