From: Daniel Hokka Zakrisson Date: Tue, 16 Oct 2007 00:27:58 +0000 (+0000) Subject: Lots of small fixes to make everything behave like it should. X-Git-Tag: release-0.30.215~81 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6feb7875a8febc89d1a290092e4960414739319d;p=util-vserver.git Lots of small fixes to make everything behave like it should. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2626 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/configure.ac b/configure.ac index d8e472a..3c47610 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,7 @@ ENSC_PATHPROG(CPIO, cpio, [cpio]) ENSC_PATHPROG(RESTORE, restore, [restore]) ENSC_PATHPROG(RSYNC, rsync, [rsync]) ENSC_PATHPROG(STRACE, strace, [strace]) +ENSC_PATHPROG(FSCK, fsck) ENSC_PATHPROG(DOXYGEN, doxygen, [:]) ENSC_PATHPROG(XSLTP, xsltp, [:]) diff --git a/scripts/util-vserver-vars.pathsubst b/scripts/util-vserver-vars.pathsubst index 2e6afbb..00a7c42 100644 --- a/scripts/util-vserver-vars.pathsubst +++ b/scripts/util-vserver-vars.pathsubst @@ -81,6 +81,7 @@ _VDU="$__SBINDIR/vdu" _VHASHIFY="$__PKGLIBDIR/vhashify" _VKILL="$__SBINDIR/vkill" _VLIMIT="$__SBINDIR/vlimit" +_VMEMCTRL="$__SBINDIR/vmemctrl" _VNAMESPACE="$__SBINDIR/vnamespace" _VPKG="$__PKGLIBDIR/vpkg" _VPROCUNHIDE="$__PKGLIBDIR/vprocunhide" @@ -98,6 +99,7 @@ _VSERVERKILLALL="$__LEGACYDIR/vserverkillall" _VSHELPER="$__PKGLIBDIR/vshelper" _VSHELPER_SYNC="$__PKGLIBDIR/vshelper-sync" _VSOMETHING="$__SBINDIR/vsomething" +_VSPACE="$__SBINDIR/vspace" _VSYSCTL="$__PKGLIBDIR/vsysctl" _VTAG="$__SBINDIR/vtag" _VWAIT="$__SBINDIR/vwait" @@ -117,6 +119,7 @@ _DIRNAME="@DIRNAME@" _EGREP="@EGREP@" _ENV="@ENV@" _FILE="@FILE@" +_FSCK="@FSCK@" _GREP="@GREP@" _GZIP="@GZIP@" _IP="@IP@" diff --git a/scripts/vserver.functions b/scripts/vserver.functions index e75c768..e2f7507 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -1254,7 +1254,7 @@ function _namespaceCleanup # these are things that have to be accessible post-cleanup for i in "$root" "$__SBINDIR" "$__PKGLIBDIR" "$vdir" \ "$__PKGSTATEDIR" "$__LOCKDIR" /usr/local /tmp "${skip[@]}"; do - local real=`readlink -f "$i"` + local real=`getPhysicalDir "$i"` test "$i" != "$real" || real= for j in "$i" "$real"; do while test -n "$j"; do diff --git a/scripts/vserver.start b/scripts/vserver.start index c47ac51..91a54a4 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -144,7 +144,7 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ $_VSYSCTL --xid self --dir "$VSERVER_DIR"/sysctl --missingok -- \ $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ - $_VMEMCTRL --xid self "${OPTS_VMEMCTRL[@]}" -- \ + $_VMEMCTRL --xid self --set "${OPTS_VMEMCTRL[@]}" -- \ "${VSERVER_EXTRA_CMDS[@]}" \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 312e5b8..79e9569 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -39,6 +39,7 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel +BuildRequires: e2fsprogs %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core Requires(pre): %pkglibdir