summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-11-05 10:29:56 +0000
committerChristian Heim <phreak@gentoo.org>2006-11-05 10:29:56 +0000
commit5937dd2b1a62932be2b89ace0351bc049e6a083b (patch)
tree51004c42cb92492a54e51c4b981d9c62c09a55b1
parentParts of 025_all_namespace-cleanup.patch slipped accidently into 005_all_base... (diff)
downloadmisc-5937dd2b1a62932be2b89ace0351bc049e6a083b.tar.gz
misc-5937dd2b1a62932be2b89ace0351bc049e6a083b.tar.bz2
misc-5937dd2b1a62932be2b89ace0351bc049e6a083b.zip
Parts from 035_all_optional-vlogin.patch accidently slipped into 030_all_gentoo-wrapper.patch. Reverting that.
svn path=/; revision=522
-rw-r--r--util-vserver/patches/0.30.211-r1/030_all_gentoo-wrapper.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/util-vserver/patches/0.30.211-r1/030_all_gentoo-wrapper.patch b/util-vserver/patches/0.30.211-r1/030_all_gentoo-wrapper.patch
index bacc450..349f03a 100644
--- a/util-vserver/patches/0.30.211-r1/030_all_gentoo-wrapper.patch
+++ b/util-vserver/patches/0.30.211-r1/030_all_gentoo-wrapper.patch
@@ -154,20 +154,6 @@ Index: scripts/vemerge
+
+test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
+exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@"
-Index: scripts/vserver
-===================================================================
---- scripts/vserver (revision 2354)
-+++ scripts/vserver (revision 2370)
-@@ -227,7 +227,8 @@
- suexec 0 chkconfig "$@"
- ;;
- (enter)
-- OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin )
-+ useVlogin && \
-+ OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin )
- getEnterShell "$VSERVER_DIR"
- suexec 0 "${ENTER_SHELL[@]}"
- ;;
Index: scripts/vdispatch-conf
===================================================================
--- scripts/vdispatch-conf (revision 0)