From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 21 Aug 2005 22:10:56 +0000 (+0000)
Subject: - sync to util-vserver-0.30.208
X-Git-Tag: after-util-vserver-0_30_208-revert~140
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b0b2af11fae82d802763ce5df4411623af1f38e0;p=util-vserver.git

- sync to util-vserver-0.30.208
- install vcached, vuseradd, and vuserdel
---

diff --git a/scripts/Makefile-files b/scripts/Makefile-files
index fccc81b..57e6206 100644
--- a/scripts/Makefile-files
+++ b/scripts/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files,v 1.1.4.3 2003/12/03 00:06:37 ensc Exp $  -*- makefile -*-
+## $Id: Makefile-files,v 1.33 2005/04/28 17:45:34 ensc Exp $  -*- makefile -*-
 
 ## Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -17,52 +17,105 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
-scriptscfgdir		=  $(sbindir)
-
-scripts_src_SCRPTS	=  scripts/distrib-info \
-			   scripts/rootshell \
-			   scripts/save_s_context \
-			   scripts/vprofile \
-			   scripts/vserverkillall \
-			   scripts/vservers.grabinfo.sh \
-			   scripts/vsysvwrapper
-scripts_gen_SCRPTS	=
-
-scripts_src_LEGSCRPTS	=  scripts/vunify.sh
-scripts_gen_LEGSCRPTS	=  scripts/vkill
-
-
-scripts_src_PRGS	=  scripts/vpstree \
-			   scripts/vrpm \
-			   scripts/vserver \
-			   scripts/vserver-copy \
-			   scripts/vcached \
-			   scripts/vuseradd \
-			   scripts/vuserdel \
-			   scripts/vtop
-scripts_gen_PRGS	=  scripts/vps
-
-scripts_PRGS		=  $(scripts_src_PRGS) $(scripts_gen_PRGS)
-scripts_SCRPTS		=  $(scripts_src_SCRPTS) $(scripts_gen_SCRPTS)
-scripts_LEGSCRPTS	=  $(scripts_src_LEGSCRPTS) $(scripts_gen_LEGSCRPTS)
-scriptscfg_DATA		=  scripts/util-vserver-vars
-
-scripts_XTRAS		=  scripts/util-vserver-vars.subst \
-			   scripts/vkill.subst \
-			   scripts/vps.subst \
-			   $(scripts_src_SCRPTS) $(scripts_src_PRGS) \
-			   $(scripts_src_LEGSCRPTS)
-
-scripts_GENSCRPTS	=  scripts/util-vserver-vars \
-			   $(scripts_gen_SCRPTS) $(scripts_gen_PRGS) \
-			   $(scripts_gen_LEGSCRPTS)
-
-scripts/%:		scripts/%.subst
-			@mkdir -p $$(dirname '$@')
-			sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \
-				s!@'SBINDIR'@!$(sbindir)!g; \
-				s!@'VSERVERDIR'@!$(vserverdir)!g' '$<' >'$@.tmp'
-			@-chmod --reference='$<' '$@.tmp'
-			@-rm -f '$@'
-			mv '$@.tmp' '$@'
-			@chmod a-w '$@'
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
+				scripts/vapt-get-worker \
+				scripts/vrpm-worker \
+				scripts/vyum-worker \
+				scripts/vrpm-preload \
+				scripts/save_s_context \
+				scripts/vservers.grabinfo.sh \
+				scripts/vpstree \
+				scripts/vserver-wrapper \
+				scripts/vsysvwrapper \
+				scripts/vtop \
+				scripts/legacy/distrib-info \
+				scripts/legacy/vps \
+				scripts/legacy/save_s_context \
+				scripts/legacy/vserver \
+				scripts/legacy/rootshell \
+				scripts/legacy/vserver-copy \
+				scripts/legacy/vserverkillall
+
+
+scripts_pkglib_src_DTA =	scripts/functions \
+				scripts/vserver-build.apt-rpm \
+				scripts/vserver-build.skeleton \
+				scripts/vserver-build.debootstrap \
+				scripts/vserver-build.rpm \
+				scripts/vserver-build.yum \
+				scripts/vserver-build.functions \
+				scripts/vserver-build.functions.apt \
+				scripts/vserver-build.functions.rpm \
+				scripts/vserver-build.functions.pkgmgmt \
+				scripts/vserver-build.functions.yum \
+				scripts/vserver-setup.functions \
+				scripts/vserver.functions \
+				scripts/vserver.start \
+				scripts/vserver.stop \
+				scripts/vserver.suexec
+
+scripts_pkglib_gen_DTA =	scripts/util-vserver-vars
+
+scripts_pkglib_src_SCRPTS =	scripts/pkgmgmt \
+				scripts/vapt-get-worker \
+				scripts/vpkg \
+				scripts/vrpm-worker \
+				scripts/vrpm-preload \
+				scripts/start-vservers \
+				scripts/vprocunhide \
+				scripts/vserver-build \
+				scripts/vserver-wrapper \
+				scripts/vservers.grabinfo.sh \
+				scripts/vshelper \
+				scripts/vsysvwrapper \
+				scripts/vyum-worker
+
+scripts_legacy_src_SCRPTS =	scripts/legacy/save_s_context \
+				scripts/legacy/vserver \
+				scripts/legacy/rootshell \
+				scripts/legacy/distrib-info \
+				scripts/legacy/vserverkillall
+scripts_legacy_gen_SCRPTS =	scripts/legacy/vps
+scripts_legacy_src_PRGS =	scripts/legacy/vserver-copy
+
+scripts_sbin_src_PRGS =		scripts/chcontext \
+				scripts/vapt-get \
+				scripts/vpstree \
+				scripts/vrpm \
+				scripts/vserver \
+				scripts/vsomething \
+				scripts/vtop \
+				scripts/vcached \
+				scripts/vuseradd \
+				scripts/vuserdel \
+				scripts/vyum
+
+scripts_sbin_gen_PRGS =
+scripts_sbincfg_gen_DTA =
+
+scripts_subst_SRCS =		scripts/util-vserver-vars.pathsubst \
+				scripts/legacy/vps.pathsubst
+
+
+
+sbin_SCRIPTS +=			$(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) \
+				$(scripts_legacy_src_PRGS)
+scripts_sbincfg_DTA =		$(scripts_sbincfg_gen_DTA)
+pkglib_SCRIPTS +=		$(scripts_pkglib_src_SCRPTS)
+legacy_SCRIPTS +=		$(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS)
+pkglib_DATA +=			$(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
+
+CLEANFILES +=			$(scripts_pkglib_gen_DTA) \
+				$(scripts_sbin_gen_PRGS) \
+				$(scripts_sbincfg_gen_DTA) \
+				$(scripts_legacy_gen_SCRPTS)
+
+EXTRA_DIST +=			$(scripts_pkglib_src_DTA) \
+				$(scripts_pkglib_src_SCRPTS) \
+				$(scripts_legacy_src_SCRPTS) \
+				$(scripts_legacy_src_PRGS) \
+				$(scripts_sbin_src_PRGS) \
+				$(scripts_subst_SRCS)
+
+scripts/util-vserver-vars:	scripts/.util-vserver-vars.pathsubst.stamp
+scripts/legacy/vps:		scripts/legacy/.vps.pathsubst.stamp