X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.template;h=dc5d1c0d75bdb341341106a8684625c350dccf04;hb=7391a7e618d3aa0b99158150beeb9958c66a4662;hp=7274dcd005428e3acf5406e69e0c67ac7a687ee5;hpb=d97ddf08e9d879d15196a5c433da731c424a37ce;p=util-vserver.git diff --git a/scripts/vserver-build.template b/scripts/vserver-build.template index 7274dcd..dc5d1c0 100644 --- a/scripts/vserver-build.template +++ b/scripts/vserver-build.template @@ -1,4 +1,4 @@ -# $Id:$ --*- sh -*-- +# $Id$ --*- sh -*-- # Copyright (C) 2006 Enrico Scholz # @@ -15,19 +15,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -tmp=$(getopt -o '+d:t:' --long debug,pkgmgmt,template: -n "vserver-build.template" -- "$@") || exit 1 +tmp=$(getopt -o '+d:t:' --long debug,pkgmgmt,template:,nodevsanity -n "vserver-build.template" -- "$@") || exit 1 eval set -- "$tmp" . "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" DISTRIBUTION=: use_pkgmgmt= +no_dev_sanity= declare -a TEMPLATE=() while true; do case "$1" in -d) DISTRIBUTION=$2; shift;; --debug) set -x;; --pkgmgmt) use_pkgmgmt=1;; + --nodevsanity) no_dev_sanity=1;; -t|--template) case "$2" in /*) f="$2";; @@ -85,6 +87,11 @@ for t in "${TEMPLATE[@]}"; do $DECOMPRESS "$t" | $EXTRACT done + +test -z "$no_dev_sanity" && { + rm -rf dev/* + populateDev +} popd &> /dev/null test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"