From ba53a7861544786a7bb878f03dd4d8665e4fea55 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Wed, 19 Dec 2007 14:28:40 +0000 Subject: [PATCH] Use/support the "new" vclone features in the clone build method. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2644 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vserver-build | 2 +- scripts/vserver-build.clone | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/vserver-build b/scripts/vserver-build index 32f7567..ad47f44 100755 --- a/scripts/vserver-build +++ b/scripts/vserver-build @@ -74,7 +74,7 @@ Possible methods are: the -f option implies -n and -d are relative to the rsync ... -- [-d ] --source [-o ]* ... installs a guest by rsyncing from to the guest root - clone ... -- [-d ] --source + clone ... -- [-d ] --source [--exclude-from ] ... clones a guest by linking unified files and copying the rest Please report bugs to $PACKAGE_BUGREPORT" diff --git a/scripts/vserver-build.clone b/scripts/vserver-build.clone index 015b523..f3ad8b0 100644 --- a/scripts/vserver-build.clone +++ b/scripts/vserver-build.clone @@ -15,7 +15,7 @@ # 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:s:o:' --long debug,pkgmgmt,source: -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o '+d:s:o:X:' --long debug,pkgmgmt,source:,exclude-from: -n "$0" -- "$@") || exit 1 eval set -- "$tmp" . "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" @@ -23,12 +23,15 @@ eval set -- "$tmp" DISTRIBUTION=: use_pkgmgmt= SOURCE= +EXCLUDES= while true; do case "$1" in -d) DISTRIBUTION=$2; shift;; --debug) set -x;; --pkgmgmt) use_pkgmgmt=1;; -s|--source) SOURCE=$2; shift;; + -X|--exclude-from) + EXCLUDES=$2; shift;; --) shift; break ;; *) echo "vserver-build.clone: internal error: unrecognized option '$1'" >&2 exit 1 @@ -63,7 +66,9 @@ setup_writeInitialFstab test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -$_VCLONE "$SOURCE"/ "$VDIR"/ +$_VCLONE ${SETUP_CONTEXT:+--xid "$SETUP_CONTEXT"} \ + ${EXCLUDES:+--exclude-from "$EXCLUDES"} \ + "$SOURCE"/ "$VDIR"/ test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -- 1.8.1.5