From: Enrico Scholz Date: Fri, 1 Oct 2004 10:58:37 +0000 (+0000) Subject: allowed to specify additional debootstrap options X-Git-Tag: IPSENTINEL_VERSION_0_12~276 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cde5f56b50bd0a29196d327d3f44ec6a023f06d;p=util-vserver.git allowed to specify additional debootstrap options git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1716 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver-build b/util-vserver/scripts/vserver-build index 31235f3..efe1117 100755 --- a/util-vserver/scripts/vserver-build +++ b/util-vserver/scripts/vserver-build @@ -56,7 +56,7 @@ Possible methods are: skeleton ... -- [ *] ... installs a minimal skeleton filesystem, creates the configuration file and calls an optional command then - debootstrap ... -- -d [-m ] + debootstrap ... -- -d [-m ] [-- *] bootstraps the vserver with Debian's 'debootstrap' package Please report bugs to $PACKAGE_BUGREPORT" diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index e824d64..a69f486 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -115,7 +115,7 @@ while true; do -m) mirror=$2; shift;; --debug) set -x;; --) shift; break ;; - *) echo "vserver-build.skeleton: internal error: unrecognized option '$1'" >&2 + *) echo "vserver-build.debootstrap: internal error: unrecognized option '$1'" >&2 exit 1 ;; esac @@ -134,6 +134,6 @@ findDebootstrap test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" mv "$VDIR"/dev "$VDIR"/dev.X -"$DEBOOTSTRAP" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... +"$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... fixupDebian "$VDIR" test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"