@touch '$@'
pkgstatedir = $(localstatedir)/run/vservers
-pkgstaterevdir = $(pkgstatedir).rev
+pkgstaterevdir = $(confdefaultsdir)/run.rev
vserverpkgdir = $(vserverdir)/.pkg
vshelperstatedir = $(localstatedir)/run/vshelper
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)" || \
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;
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"
SETUP_NETPREFIX=
SETUP_NETBCAST=
SETUP_LOCKFILE=
-SETUP_LOCKREVDIR=
SETUP_CONFDIR=
SETUP_CONTEXT=
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/<name>]
--lockfile <filename>
... [default: $RUNDIR/<name>]
- --lockrevdir <dirname>
- ... [default: $CONFDIR/.defaults/run.rev]
--hostname <hostname>
--netdev <device>
--netbcast <broadcast>
... 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)
(--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;;
{
: ${SETUP_CONFDIR:=$CONFDIR/$1}
: ${SETUP_LOCKFILE:=$RUNDIR/$1}
- : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev}
findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab
}
done >"$cfgdir"/flags
ln -s "$SETUP_LOCKFILE" "$cfgdir"/run
- ln -s "$SETUP_LOCKREVDIR" "$cfgdir"/run.rev
}
function setup_writeInitialFstab
# include <config.h>
#endif
+#include "pathconfig.h"
#include "vserver.h"
#include "internal.h"
#include "util.h"
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];
}
Eclose(fd);
- strcat(runfile, ".rev/");
+ strcpy(runfile, DEFAULT_PKGSTATEREVDIR);
strncat(runfile, buf, len);
unlink(runfile);
EsymlinkD(argv[1], runfile);
%define __chattr /usr/bin/chattr
%define chkconfig /sbin/chkconfig
+%define _localstatedir %_var
+
Summary: Linux virtual server utilities
Name: @PACKAGE@
Version: @VERSION@
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 || :
%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