X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-tftp-hpa;h=4fe70ceecd9a5221e1271ed25f0d4e3848de2be0;hb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;hp=1f80e38f0f049db31887d5c95552d77a617421db;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-tftp-hpa b/stage3/cis-tftp-hpa
index 1f80e38..4fe70ce 100755
--- a/stage3/cis-tftp-hpa
+++ b/stage3/cis-tftp-hpa
@@ -1,27 +1,36 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
+# Remaining arguments are additional configure options.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
 
-# For packages that don't compile well from a separate build directory.
-cd ${LFS_TMP}/${1} &&
+# Need to specify mandir manually because of a stupid programming error in tftpd sources...
+cd ${LFS_TMP}/${PACKAGE}
 ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc &&
-make &&
-make install &&
-ldconfig &&
+    --sysconfdir=/etc \
+    --mandir=/usr/man \
+    --without-tcpwrappers \
+    ${CONFIGURE_OPTS}
+make
+make install
+ldconfig
 
-mkdir -v -p /srv/tftpboot &&
+mkdir -v -p /srv/tftpboot
 
 # Addition to /etc/inetd.conf
-string_add "tftp  dgram  udp wait       root  /usr/sbin/in.tftpd in.tftpd -s /srv/tftpboot" /etc/inetd.conf
+string_add "tftp  dgram  udp wait       root  /usr/sbin/in.tftpd in.tftpd -s /srv/tftpboot -v -v -v -v -v" /etc/inetd.conf
 
-# Return last error
 exit $?