X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fcis-inetutils;h=d1076bc443487ce18831ad162681af6d37a70127;hb=d9a5344c1aa683d051d1a1d5e87f0bba317e299a;hp=0ae48ef8c60b0f25427372f480df7d5275a1c193;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage2/cis-inetutils b/stage2/cis-inetutils
index 0ae48ef..d1076bc 100755
--- a/stage2/cis-inetutils
+++ b/stage2/cis-inetutils
@@ -1,30 +1,35 @@
-#!/bin/sh
-# First argument of this script is the package name
+#!/bin/bash
+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
 
-# This is only a basic installation (no servers) of inetutils.
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
 
-cd ${LFS_TMP}/${1}-build &&
-../${1}/configure \
+# This is only a basic installation (no servers) of inetutils.
+
+cd ${LFS_TMP}/${PACKAGE}-build
+../${PACKAGE}/configure \
     --prefix=/usr \
-    --libexecdir=/usr/sbin \
     --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-logger \
-    --disable-syslogd \
-    --disable-whois \
-    --disable-servers &&
-make -j ${MAKEJOBS} &&
-make install &&
+    ${CONFIGURE_OPTS}
+make
+make install
+
+# Move some programs to their FHS-compliant place:
+mv -v /usr/bin/{hostname,ping,ping6} /bin
+mv -v /usr/bin/traceroute /sbin
 
-mv -fv /usr/bin/ping /bin
+ldconfig
 
-# Return last error
 exit $?