merge with 0.30.213

[util-vserver.git] / scripts / vserver-build

diff --git a/scripts/vserver-build b/scripts/vserver-build
index ca522e4..fc78e6f 100755 (executable)
--- a/scripts/vserver-build
+++ b/scripts/vserver-build
@@ -1,5 +1,5 @@
 #! /bin/bash
-# $Id: vserver-build,v 1.20 2005/07/03 17:45:43 ensc Exp $
+# $Id: vserver-build 2468 2007-01-21 20:05:19Z dhozac $
 
 # Copyright (C) 2003,2004,2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -51,21 +51,31 @@ Possible methods are:
     legacy      ...  the \"old\" copy-all-from-host method, which requires the
                      old legacy  vserver-legacy script;  with  this method the
                     cfg-options will be ignored
-    copy        ...  the copy-all-from-host method which uses the recent
-                     configuration scheme
-    apt-rpm ... -- -d <distribution>
+    apt-rpm     ... -- -d <distribution>
                 ...  installs the base-packages of the given distribution with
                     help of 'vapt-get'
-    yum     ... -- -d <distribution>
+    yum         ... -- -d <distribution>
                 ...  installs the base-packages of the given distribution with
                     help of 'vyum'
-    rpm     ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
+    rpm         ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
                 ...  installs lists of rpm-packages
-    skeleton ... -- [<cmd> <args>*]
+    skeleton    ... -- [<cmd> <args>*]
                 ...  installs a minimal skeleton filesystem, creates the
                     configuration file and calls an optional command then
-    debootstrap ... -- -d <distribution> [-m <mirror>] [-- <debootstrap-options>*]
-                     bootstraps the vserver with Debian's 'debootstrap' package
+    debootstrap ... -- -d <distribution> [-m <mirror>] [-s <script> ] [-- <debootstrap-options>*]
+                ...  bootstraps the vserver with Debian's 'debootstrap' package
+    template    ... -- (-t <tarball>)+ [-d <distribution>]
+                ...  installs a guest using tarball(s)
+    fai         ... -- [ -f <fai_vserver> ] [-n <nfsroot>] [-d <fai_dir> ] [ -a ]
+                     bootstraps the vserver with Debian Fully Automatic Installation
+                     -f means use the nfsroot and profile in the vserver <fai_vserver>
+                     -n <nfsroot> specifies the 'NFS' root explicitly
+                     -d <fai_dir> specifies the location of the FAI profile
+                     the -f option implies -n and -d are relative to the <fai_vserver>
+    rsync       ... -- [-d <distribution>] --source <source> [-o <rsync option>]*
+                ...  installs a guest by rsyncing from <source> to the guest root
+    clone       ... -- [-d <distribution>] --source <source>
+                ...  clones a guest by linking unified files and copying the rest
 
 Please report bugs to $PACKAGE_BUGREPORT"
     exit 0
@@ -126,7 +136,7 @@ setup_setDefaults "$VSERVER_NAME"
 
 case x"$method" in
     (xlegacy)  exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
-    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm)
+    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
                . $__PKGLIBDIR/vserver-build.$method
                ;;
     (x)                panic $"No build-method specified";;