From de9e27feb6648f76b77b3af5012adae22db4a1fe Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 31 Jan 2005 17:43:31 +0000 Subject: [PATCH] removed 'run.rev' as a vserver-local variable and made it a system-wide setting git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1827 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/Makefile.am | 8 ++++---- util-vserver/lib/createskeleton-full.hc | 12 ------------ util-vserver/scripts/vserver-build.functions | 2 +- util-vserver/scripts/vserver-setup.functions | 11 +++-------- util-vserver/src/save_ctxinfo.c | 5 +++-- util-vserver/util-vserver.spec.in | 12 +++++++----- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index e658058..5feb05b 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -175,7 +175,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @touch '$@' pkgstatedir = $(localstatedir)/run/vservers -pkgstaterevdir = $(pkgstatedir).rev +pkgstaterevdir = $(confdefaultsdir)/run.rev vserverpkgdir = $(vserverdir)/.pkg vshelperstatedir = $(localstatedir)/run/vshelper @@ -190,10 +190,10 @@ update-doc: doc install-data-hook: install-fix-script-paths install-create-dirs install-create-dirs: - $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(DESTDIR)$(vshelperstatedir) + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir) $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir) - f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" - f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" + f=$(DESTDIR)$(pkgstaterevdir); test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f" install-fix-script-paths: test "/usr/lib/util-vserver" = "$(pkglibdir)" || \ diff --git a/util-vserver/lib/createskeleton-full.hc b/util-vserver/lib/createskeleton-full.hc index e7c622c..8090a93 100644 --- a/util-vserver/lib/createskeleton-full.hc +++ b/util-vserver/lib/createskeleton-full.hc @@ -73,18 +73,6 @@ vc_createSkeleton_full(char const *id, char const *name, int flags) return -1; for (;;) { - char const *basedir = CONFDIR "/.defaults/run.rev"; - - if (!utilvserver_isDirectory(basedir, true)) basedir = DEFAULT_PKGSTATEREVDIR; - if (!utilvserver_isDirectory(basedir, true)) break; - - if (symlink2(basedir, "", id, "run.rev")==-1) - return -1; - - break; - } - - for (;;) { char const *basedir = CONFDIR "/.defaults/run"; if (!utilvserver_isDirectory(basedir, true)) basedir = DEFAULT_PKGSTATEDIR; diff --git a/util-vserver/scripts/vserver-build.functions b/util-vserver/scripts/vserver-build.functions index b3de22d..b73d1d1 100644 --- a/util-vserver/scripts/vserver-build.functions +++ b/util-vserver/scripts/vserver-build.functions @@ -158,7 +158,7 @@ exist already; please try to use '--force', or remove them manually" mkdir -p -m755 "$VDIR" chattr -t "$VDIR" - mkdir -p -m755 "$SETUP_CONFDIR"/apps "$VDIR"/{dev/pts,etc} "$SETUP_LOCKREVDIR" + mkdir -p -m755 "$SETUP_CONFDIR"/apps "$VDIR"/{dev/pts,etc} ln -s "$VDIR" "$SETUP_CONFDIR/vdir" diff --git a/util-vserver/scripts/vserver-setup.functions b/util-vserver/scripts/vserver-setup.functions index 431c638..0dc0634 100644 --- a/util-vserver/scripts/vserver-setup.functions +++ b/util-vserver/scripts/vserver-setup.functions @@ -21,7 +21,6 @@ SETUP_NETMASK= SETUP_NETPREFIX= SETUP_NETBCAST= SETUP_LOCKFILE= -SETUP_LOCKREVDIR= SETUP_CONFDIR= SETUP_CONTEXT= SETUP_INITSTYLE= @@ -29,15 +28,13 @@ SETUP_INITSTYLE= declare -a SETUP_INTERFACES=() declare -a SETUP_FLAGS=() -declare -r SETUP_OPTIONS="confdir:,lockfile:,lockrevdir:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:" +declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:" declare -r SETUP_HELPMSG=$" --context ... the static context of the vserver [default: none; a dynamic context will be assumed] --confdir ... [default: $CONFDIR/] --lockfile ... [default: $RUNDIR/] - --lockrevdir - ... [default: $CONFDIR/.defaults/run.rev] --hostname --netdev --netbcast @@ -51,7 +48,8 @@ declare -r SETUP_HELPMSG=$" ... sets comma-separated list of flags; possible flags are lock: Prevent the vserver from setting new security context sched: Merge scheduler priority of all processes in the - vserver so that it acts a like a single one. + vserver so that it acts a like a single + one (kernel 2.4 only). nproc: Limit the number of processes in the vserver according to ulimit (instead of a per user limit, this becomes a per vserver limit) @@ -67,7 +65,6 @@ function setup_setOption2 (--context) SETUP_CONTEXT=$2;; (--confdir) SETUP_CONFDIR=$2;; (--lockfile) SETUP_LOCKFILE=$2;; - (--lockrevdir) SEUTP_LOCKREVDIR=$2;; (--hostname) SETUP_HOSTNAME=$2;; (--netdev) SETUP_NETDEV=$2;; (--netmask) SETUP_NETMASK=$2;; @@ -134,7 +131,6 @@ function setup_setDefaults { : ${SETUP_CONFDIR:=$CONFDIR/$1} : ${SETUP_LOCKFILE:=$RUNDIR/$1} - : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev} findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab } @@ -166,7 +162,6 @@ function setup_writeOption done >"$cfgdir"/flags ln -s "$SETUP_LOCKFILE" "$cfgdir"/run - ln -s "$SETUP_LOCKREVDIR" "$cfgdir"/run.rev } function setup_writeInitialFstab diff --git a/util-vserver/src/save_ctxinfo.c b/util-vserver/src/save_ctxinfo.c index cfb26fa..44439ac 100644 --- a/util-vserver/src/save_ctxinfo.c +++ b/util-vserver/src/save_ctxinfo.c @@ -22,6 +22,7 @@ # include #endif +#include "pathconfig.h" #include "vserver.h" #include "internal.h" #include "util.h" @@ -52,7 +53,7 @@ checkParams(int argc, char UNUSED * argv[]) int main(int argc, char *argv[]) { - char runfile[(checkParams(argc,argv),strlen(argv[1])) + sizeof("/run.rev/99999")]; + char runfile[(checkParams(argc,argv),strlen(argv[1])) + sizeof(DEFAULT_PKGSTATEREVDIR "/99999")]; char dstfile[PATH_MAX]; int fd; char buf[sizeof(int)*3+2]; @@ -87,7 +88,7 @@ int main(int argc, char *argv[]) } Eclose(fd); - strcat(runfile, ".rev/"); + strcpy(runfile, DEFAULT_PKGSTATEREVDIR); strncat(runfile, buf, len); unlink(runfile); EsymlinkD(argv[1], runfile); diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 51ba84e..01f05c6 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -10,6 +10,8 @@ %define __chattr /usr/bin/chattr %define chkconfig /sbin/chkconfig +%define _localstatedir %_var + Summary: Linux virtual server utilities Name: @PACKAGE@ Version: @VERSION@ @@ -133,8 +135,8 @@ rm -rf $RPM_BUILD_ROOT test -d /vservers || mkdir -m0000 /vservers test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg -f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" -f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s /var/run/vservers.rev "$f" +f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" +f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" %_sbindir/setattr --barrier /vservers || : @@ -207,9 +209,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev -%dir /var/run/vservers -%dir /var/run/vservers.rev -%dir /var/run/vshelper +%dir %_localstatedir/run/vservers +%dir %_localstatedir/run/vservers.rev +%dir %_localstatedir/run/vshelper %files lib -f %name-lib.list -- 1.8.1.5